torquebox-configure 2.0.0.beta1-java → 2.0.0.beta2-java

data/lib/gem_hook.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2011 Red Hat, Inc, and individual contributors.
+# Copyright 2008-2012 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

data/lib/torquebox-configure.rb

@@ -1,6 +1,6 @@
 module TorqueboxConfigure
-  VERSION = '2.0.0.beta1'
-  MAVEN_VERSION = '2.0.0.beta1'
+  VERSION = '2.0.0.beta2'
+  MAVEN_VERSION = '2.0.0.beta2'
 end
 begin
   require 'java'

data/lib/torquebox/configuration.rb

@@ -1,15 +1,15 @@
-# Copyright 2008-2011 Red Hat, Inc, and individual contributors.
-#
+# Copyright 2008-2012 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

data/lib/torquebox/configuration/global.rb

@@ -1,15 +1,15 @@
-# Copyright 2008-2011 Red Hat, Inc, and individual contributors.
-#
+# Copyright 2008-2012 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
@@ -71,6 +71,8 @@ module TorqueBox
                                                                 :optional => [
                                                                               :concurrency,
                                                                               { :singleton => [true, false] },
+                                                                              { :durable => [true, false] },
+                                                                              :client_id,
                                                                               :config,
                                                                               :filter,
                                                                               :name
@@ -82,7 +84,8 @@ module TorqueBox
                                                                      { :compile_mode => [:force, :jit, :off,
                                                                                          'force', 'jit', 'off'] },
                                                                      { :debug => [true, false] },
-                                                                     { :interactive => [true, false] }
+                                                                     { :interactive => [true, false] },
+                                                                     { :profile_api => [true, false] }
                                                                     ]
                                                      }),
           :service     => ThingWithOptionsEntry.with_settings(:discrete => true,

data/lib/torquebox/configuration/validator.rb

@@ -1,15 +1,15 @@
-# Copyright 2008-2011 Red Hat, Inc, and individual contributors.
-#
+# Copyright 2008-2012 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

data/lib/torquebox/configure.rb

@@ -1,15 +1,15 @@
-# Copyright 2008-2011 Red Hat, Inc, and individual contributors.
-#
+# Copyright 2008-2012 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

data/spec/global_spec.rb

@@ -143,12 +143,13 @@ describe "TorqueBox.configure using the GlobalConfiguration" do
     it_should_behave_like 'options'
 
     it_should_not_allow_invalid_options { ruby :foo => :bar }
-    it_should_allow_valid_options { ruby :version => '1.9', :compile_mode => :jit, :debug => true, :interactive => true }
+    it_should_allow_valid_options { ruby :version => '1.9', :compile_mode => :jit, :debug => true, :interactive => true, :profile_api => true }
 
     it_should_not_allow_invalid_option_values { ruby :version => '2' }
     it_should_not_allow_invalid_option_values { ruby :compile_mode => :bacon }
     it_should_not_allow_invalid_option_values { ruby :debug => :sure }
     it_should_not_allow_invalid_option_values { ruby :interactive => :sure }
+    it_should_not_allow_invalid_option_values { ruby :profile_api => :goforit }
     it_should_allow_valid_option_values { ruby :version => '1.8', :compile_mode => :jit }
   end
 
@@ -226,7 +227,7 @@ describe "TorqueBox.configure using the GlobalConfiguration" do
 
     it_should_allow_valid_options  do
       topic 'a-topic' do
-        processor 'AClass', :concurrency => 1, :config => '', :filter => '', :name => '', :singleton=>true
+        processor 'AClass', :concurrency => 1, :config => '', :filter => '', :name => '', :durable => true, :client_id => 'client-id', :singleton=>true
       end
     end
 
@@ -375,11 +376,7 @@ describe "TorqueBox.configure using the GlobalConfiguration" do
           'foo' => { :type => :bounded, :min => 1, :max => 2 } },
         'queue' => {
           'a-queue' => {
-            :create => false,
-            'processor' => [ [ FakeConstant.new( 'AProcessor' ),
-                               {
-                                 :name => 'a-proc',
-                                 :config => { :foo => :bar } } ] ]
+            :create => false
           },
           'another-queue' => {},
         },
@@ -397,8 +394,15 @@ describe "TorqueBox.configure using the GlobalConfiguration" do
                         [ FakeConstant.new( 'AnotherStomplet' ), {
                             :route => '/b',
                             :config => { :foo => :bar } } ] ],
-        'topic' => { 'a-topic' => { :durable => true } },
-        'web' => { :context => '/bacon' }
+        'topic' => { 'a-topic' => {
+            :durable => true,
+            'processor' => [ [ FakeConstant.new( 'AProcessor' ),
+                               {
+                                 :name => 'a-proc',
+                                 :durable => true,
+                                 :client_id => 'client-id',
+                                 :config => { :foo => :bar } } ] ] } },
+          'web' => { :context => '/bacon' }
       }
 
       @metadata = @config.to_metadata_hash
@@ -442,7 +446,12 @@ describe "TorqueBox.configure using the GlobalConfiguration" do
     end
 
     it "should properly set a processor" do
-      @metadata['messaging']['a-queue']['AProcessor'].should == { "name" => 'a-proc', "config" => { 'foo' => :bar } }
+      @metadata['messaging']['a-topic']['AProcessor'].should == {
+        "name" => 'a-proc',
+        "durable" => true,
+        "client_id" => 'client-id',
+        "config" => { 'foo' => :bar }
+      }
     end
 
     it "should properly set a queue" do

metadata

@@ -2,7 +2,7 @@
 name: torquebox-configure
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 2.0.0.beta1
+  version: 2.0.0.beta2
 platform: java
 authors: 
   - The TorqueBox Team
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-02 00:00:00 Z
+date: 2012-01-05 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: blankslate