torquebox 1.1.1 → 2.0.0.beta1

data/bin/torquebox

@@ -0,0 +1,138 @@
+#!/usr/bin/env ruby
+
+# Copyright 2008-2011 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.
+
+require 'thor'
+require 'torquebox-rake-support'
+require 'torquebox/server'
+
+class TorqueBoxCommand < Thor
+
+  TASK_ORDER = %w(deploy undeploy start cli env help)
+
+  map "run" => "start"
+  desc "run", "Run TorqueBox"
+  method_option :clustered, :type => :boolean, :desc => "Run TorqueBox in clustered mode"
+  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"
+  def start
+    setup_environment
+    TorqueBox::DeployUtils.run_server(:clustered => options.clustered,
+                                      :max_threads => options['max-threads'],
+                                      :bind_address => options['bind-address'])
+  end
+
+  desc "deploy ROOT", "Deploy an application to TorqueBox"
+  long_desc <<-EOS
+    Deploy an application to TorqueBox. The ROOT argument should point to either
+    a directory containing the application you want to deploy, a -knob.yml file,
+    a .knob archive, or any Java deployable artifact (.war, .ear, etc).
+  EOS
+  method_option :context_path, :type => :string, :desc => "Context Path (ex: /, /my_app)"
+  method_option :env, :type => :string, :desc => "Application Environment (ex: development, test, production)"
+  def deploy(root = ".")
+    setup_environment
+    root = File.expand_path(root)
+    opts = {:root => root}.merge(options)
+    descriptor = TorqueBox::DeployUtils.basic_deployment_descriptor(opts)
+    deployment_name = TorqueBox::DeployUtils.deployment_name(root)
+    deployed_name, deploy_dir = TorqueBox::DeployUtils.deploy_yaml(descriptor, deployment_name)
+    puts "Deployed: #{deployed_name}"
+    puts "    into: #{deploy_dir}"
+  end
+
+  desc "undeploy ROOT", "Undeploy an application from TorqueBox"
+  def undeploy(root = ".")
+    setup_environment
+    root = File.expand_path(root)
+    deployment_name = TorqueBox::DeployUtils.deployment_name(root)
+    deploy_name, deploy_dir = TorqueBox::DeployUtils.undeploy(deployment_name)
+
+    if deploy_name
+      puts "Undeployed: #{deploy_name}"
+      puts "      from: #{deploy_dir}"
+    else
+      puts "Nothing to undeploy"
+    end
+  end
+
+  desc "cli", "Run the JBoss AS7 CLI"
+  def cli
+    setup_environment
+    options = "--connect"
+    if Config::CONFIG['host_os'] =~ /mswin/
+      path = File.join(TorqueBox::Server.jboss_home, "bin\\jboss-admin")
+      exec(path, options)
+    else
+      path = "/bin/sh #{File.join(TorqueBox::Server.jboss_home, 'bin/jboss-admin.sh')}"
+      exec "#{path} #{options}"
+    end
+  end
+
+  desc "env [VARIABLE]", "Display TorqueBox environment variables"
+  def env(variable=nil)
+    setup_environment
+    env_keys = %w(TORQUEBOX_HOME JBOSS_HOME JRUBY_HOME)
+    if variable.nil?
+      env_keys.each { |key| shell.say "#{key}=#{ENV[key]}" }
+    else
+      key = env_keys.find { |key| variable.downcase == key.downcase }
+      shell.say(ENV[key]) unless key.nil?
+    end
+  end
+
+  no_tasks {
+    def setup_environment
+      ENV['TORQUEBOX_HOME'] ||= TorqueBox::Server.torquebox_home
+      ENV['JBOSS_HOME'] ||= TorqueBox::Server.jboss_home
+      ENV['JRUBY_HOME'] ||= TorqueBox::Server.jruby_home
+      ENV['JBOSS_OPTS'] ||= "-Djruby.home=#{TorqueBox::Server.jruby_home}"
+      %w(TORQUEBOX_HOME JBOSS_HOME JRUBY_HOME).each { |key| puts "[ERROR] #{key} is not set. Install torquebox-server gem or manually set #{key}" unless ENV[key] }
+    end
+
+    class << self
+      # Override all_tasks and help methods in Thor to print options
+      # out in the order we prefer
+      alias_method :all_tasks_from_super, :all_tasks
+
+      def all_tasks
+        super_tasks = all_tasks_from_super
+        tasks = Thor::CoreExt::OrderedHash.new
+        TASK_ORDER.each do |task|
+          tasks[task] = super_tasks[task] unless super_tasks[task].nil?
+        end
+        tasks.merge(super_tasks)
+      end
+
+      def help(shell, subcommand = false)
+        list = printable_tasks(true, subcommand)
+        Thor::Util.thor_classes_in(self).each do |klass|
+          list += klass.printable_tasks(false)
+        end
+
+        shell.say "Tasks:"
+        shell.print_table(list, :ident => 2, :truncate => true)
+        shell.say
+        class_options_help(shell)
+      end
+    end
+  }
+
+end
+
+TorqueBoxCommand.start

data/lib/torquebox.rb

@@ -15,7 +15,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
-require 'torquebox-base'
+require 'torquebox-core'
 require 'torquebox-naming'
 require 'torquebox-messaging'
 require 'torquebox-web'

data/licenses/lgpl-2.1.txt

@@ -1,5 +1,5 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
@@ -10,7 +10,7 @@
  as the successor of the GNU Library Public License, version 2, hence
  the version number 2.1.]
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -112,7 +112,7 @@ modification follow.  Pay close attention to the difference between a
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
 
-		  GNU LESSER GENERAL PUBLIC LICENSE
+                  GNU LESSER GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library or other
@@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based
 on the Library (independent of the use of the Library in a tool for
 writing it).  Whether that is true depends on what the Library does
 and what the program that uses the Library does.
-  
+
   1. You may copy and distribute verbatim copies of the Library's
 complete source code as you receive it, in any medium, provided that
 you conspicuously and appropriately publish on each copy an
@@ -432,7 +432,7 @@ decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -455,7 +455,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
            How to Apply These Terms to Your New Libraries
 
@@ -500,5 +500,3 @@ necessary.  Here is a sample; alter the names:
   Ty Coon, President of Vice
 
 That's all there is to it!
-
-

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: torquebox
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.1.1
+  prerelease: 6
+  version: 2.0.0.beta1
 platform: ruby
 authors: 
   - The TorqueBox Team
@@ -10,89 +10,168 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-09 00:00:00 -04:00
-default_executable: 
+date: 2011-12-02 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
-    name: torquebox-base
+    name: torquebox-core
     prerelease: false
     requirement: &id001 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 1.1.1
+            version: 2.0.0.beta1
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
-    name: torquebox-messaging
+    name: torquebox-transactions
     prerelease: false
     requirement: &id002 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 1.1.1
+            version: 2.0.0.beta1
     type: :runtime
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
-    name: torquebox-naming
+    name: torquebox-configure
     prerelease: false
     requirement: &id003 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 1.1.1
+            version: 2.0.0.beta1
     type: :runtime
     version_requirements: *id003
   - !ruby/object:Gem::Dependency 
-    name: torquebox-rake-support
+    name: torquebox-messaging
     prerelease: false
     requirement: &id004 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 1.1.1
+            version: 2.0.0.beta1
     type: :runtime
     version_requirements: *id004
   - !ruby/object:Gem::Dependency 
-    name: torquebox-vfs
+    name: torquebox-naming
     prerelease: false
     requirement: &id005 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 1.1.1
+            version: 2.0.0.beta1
     type: :runtime
     version_requirements: *id005
   - !ruby/object:Gem::Dependency 
-    name: torquebox-web
+    name: torquebox-rake-support
     prerelease: false
     requirement: &id006 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 1.1.1
+            version: 2.0.0.beta1
     type: :runtime
     version_requirements: *id006
+  - !ruby/object:Gem::Dependency 
+    name: torquebox-security
+    prerelease: false
+    requirement: &id007 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - "="
+          - !ruby/object:Gem::Version 
+            version: 2.0.0.beta1
+    type: :runtime
+    version_requirements: *id007
+  - !ruby/object:Gem::Dependency 
+    name: torquebox-vfs
+    prerelease: false
+    requirement: &id008 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - "="
+          - !ruby/object:Gem::Version 
+            version: 2.0.0.beta1
+    type: :runtime
+    version_requirements: *id008
+  - !ruby/object:Gem::Dependency 
+    name: torquebox-web
+    prerelease: false
+    requirement: &id009 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - "="
+          - !ruby/object:Gem::Version 
+            version: 2.0.0.beta1
+    type: :runtime
+    version_requirements: *id009
+  - !ruby/object:Gem::Dependency 
+    name: torquebox-cache
+    prerelease: false
+    requirement: &id010 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - "="
+          - !ruby/object:Gem::Version 
+            version: 2.0.0.beta1
+    type: :runtime
+    version_requirements: *id010
+  - !ruby/object:Gem::Dependency 
+    name: torquebox-stomp
+    prerelease: false
+    requirement: &id011 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - "="
+          - !ruby/object:Gem::Version 
+            version: 2.0.0.beta1
+    type: :runtime
+    version_requirements: *id011
+  - !ruby/object:Gem::Dependency 
+    name: thor
+    prerelease: false
+    requirement: &id012 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 0.9.0
+        - - <
+          - !ruby/object:Gem::Version 
+            version: 1.0.0
+    type: :runtime
+    version_requirements: *id012
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    prerelease: false
+    requirement: &id013 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - "="
+          - !ruby/object:Gem::Version 
+            version: 2.7.0
+    type: :development
+    version_requirements: *id013
 description: ""
 email: 
   - torquebox-dev@torquebox.org
-executables: []
-
+executables: 
+  - torquebox
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
   - licenses/lgpl-2.1.txt
+  - bin/torquebox
   - lib/torquebox.rb
-has_rdoc: true
-homepage: http://www.torquebox.org/client-parent/torquebox/
+homepage: http://www.torquebox.org/torquebox-gems-parent/torquebox/
 licenses: 
   - lgpl
 post_install_message: 
@@ -109,13 +188,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.1
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: TorqueBox Gem