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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. data/lib/gem_hook.rb +1 -1
  2. data/lib/torquebox-configure.jar +0 -0
  3. data/lib/torquebox-configure.rb +2 -2
  4. data/lib/torquebox/configuration.rb +4 -4
  5. data/lib/torquebox/configuration/global.rb +8 -5
  6. data/lib/torquebox/configuration/validator.rb +4 -4
  7. data/lib/torquebox/configure.rb +4 -4
  8. data/spec/global_spec.rb +19 -10
  9. metadata +2 -2
data/lib/gem_hook.rb CHANGED
@@ -1,4 +1,4 @@
1
- # Copyright 2008-2011 Red Hat, Inc, and individual contributors.
1
+ # Copyright 2008-2012 Red Hat, Inc, and individual contributors.
2
2
  #
3
3
  # This is free software; you can redistribute it and/or modify it
4
4
  # under the terms of the GNU Lesser General Public License as
data/lib/torquebox-configure.jar CHANGED
Binary file
data/lib/torquebox-configure.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module TorqueboxConfigure
2
- VERSION = '2.0.0.beta1'
3
- MAVEN_VERSION = '2.0.0.beta1'
2
+ VERSION = '2.0.0.beta2'
3
+ MAVEN_VERSION = '2.0.0.beta2'
4
4
  end
5
5
  begin
6
6
  require 'java'
data/lib/torquebox/configuration.rb CHANGED
@@ -1,15 +1,15 @@
1
- # Copyright 2008-2011 Red Hat, Inc, and individual contributors.
2
- #
1
+ # Copyright 2008-2012 Red Hat, Inc, and individual contributors.
2
+ #
3
3
  # This is free software; you can redistribute it and/or modify it
4
4
  # under the terms of the GNU Lesser General Public License as
5
5
  # published by the Free Software Foundation; either version 2.1 of
6
6
  # the License, or (at your option) any later version.
7
- #
7
+ #
8
8
  # This software is distributed in the hope that it will be useful,
9
9
  # but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11
11
  # Lesser General Public License for more details.
12
- #
12
+ #
13
13
  # You should have received a copy of the GNU Lesser General Public
14
14
  # License along with this software; if not, write to the Free
15
15
  # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
data/lib/torquebox/configuration/global.rb CHANGED
@@ -1,15 +1,15 @@
1
- # Copyright 2008-2011 Red Hat, Inc, and individual contributors.
2
- #
1
+ # Copyright 2008-2012 Red Hat, Inc, and individual contributors.
2
+ #
3
3
  # This is free software; you can redistribute it and/or modify it
4
4
  # under the terms of the GNU Lesser General Public License as
5
5
  # published by the Free Software Foundation; either version 2.1 of
6
6
  # the License, or (at your option) any later version.
7
- #
7
+ #
8
8
  # This software is distributed in the hope that it will be useful,
9
9
  # but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11
11
  # Lesser General Public License for more details.
12
- #
12
+ #
13
13
  # You should have received a copy of the GNU Lesser General Public
14
14
  # License along with this software; if not, write to the Free
15
15
  # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
@@ -71,6 +71,8 @@ module TorqueBox
71
71
  :optional => [
72
72
  :concurrency,
73
73
  { :singleton => [true, false] },
74
+ { :durable => [true, false] },
75
+ :client_id,
74
76
  :config,
75
77
  :filter,
76
78
  :name
@@ -82,7 +84,8 @@ module TorqueBox
82
84
  { :compile_mode => [:force, :jit, :off,
83
85
  'force', 'jit', 'off'] },
84
86
  { :debug => [true, false] },
85
- { :interactive => [true, false] }
87
+ { :interactive => [true, false] },
88
+ { :profile_api => [true, false] }
86
89
  ]
87
90
  }),
88
91
  :service => ThingWithOptionsEntry.with_settings(:discrete => true,
data/lib/torquebox/configuration/validator.rb CHANGED
@@ -1,15 +1,15 @@
1
- # Copyright 2008-2011 Red Hat, Inc, and individual contributors.
2
- #
1
+ # Copyright 2008-2012 Red Hat, Inc, and individual contributors.
2
+ #
3
3
  # This is free software; you can redistribute it and/or modify it
4
4
  # under the terms of the GNU Lesser General Public License as
5
5
  # published by the Free Software Foundation; either version 2.1 of
6
6
  # the License, or (at your option) any later version.
7
- #
7
+ #
8
8
  # This software is distributed in the hope that it will be useful,
9
9
  # but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11
11
  # Lesser General Public License for more details.
12
- #
12
+ #
13
13
  # You should have received a copy of the GNU Lesser General Public
14
14
  # License along with this software; if not, write to the Free
15
15
  # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
data/lib/torquebox/configure.rb CHANGED
@@ -1,15 +1,15 @@
1
- # Copyright 2008-2011 Red Hat, Inc, and individual contributors.
2
- #
1
+ # Copyright 2008-2012 Red Hat, Inc, and individual contributors.
2
+ #
3
3
  # This is free software; you can redistribute it and/or modify it
4
4
  # under the terms of the GNU Lesser General Public License as
5
5
  # published by the Free Software Foundation; either version 2.1 of
6
6
  # the License, or (at your option) any later version.
7
- #
7
+ #
8
8
  # This software is distributed in the hope that it will be useful,
9
9
  # but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11
11
  # Lesser General Public License for more details.
12
- #
12
+ #
13
13
  # You should have received a copy of the GNU Lesser General Public
14
14
  # License along with this software; if not, write to the Free
15
15
  # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
data/spec/global_spec.rb CHANGED
@@ -143,12 +143,13 @@ describe "TorqueBox.configure using the GlobalConfiguration" do
143
143
  it_should_behave_like 'options'
144
144
 
145
145
  it_should_not_allow_invalid_options { ruby :foo => :bar }
146
- it_should_allow_valid_options { ruby :version => '1.9', :compile_mode => :jit, :debug => true, :interactive => true }
146
+ it_should_allow_valid_options { ruby :version => '1.9', :compile_mode => :jit, :debug => true, :interactive => true, :profile_api => true }
147
147
 
148
148
  it_should_not_allow_invalid_option_values { ruby :version => '2' }
149
149
  it_should_not_allow_invalid_option_values { ruby :compile_mode => :bacon }
150
150
  it_should_not_allow_invalid_option_values { ruby :debug => :sure }
151
151
  it_should_not_allow_invalid_option_values { ruby :interactive => :sure }
152
+ it_should_not_allow_invalid_option_values { ruby :profile_api => :goforit }
152
153
  it_should_allow_valid_option_values { ruby :version => '1.8', :compile_mode => :jit }
153
154
  end
154
155
 
@@ -226,7 +227,7 @@ describe "TorqueBox.configure using the GlobalConfiguration" do
226
227
 
227
228
  it_should_allow_valid_options do
228
229
  topic 'a-topic' do
229
- processor 'AClass', :concurrency => 1, :config => '', :filter => '', :name => '', :singleton=>true
230
+ processor 'AClass', :concurrency => 1, :config => '', :filter => '', :name => '', :durable => true, :client_id => 'client-id', :singleton=>true
230
231
  end
231
232
  end
232
233
 
@@ -375,11 +376,7 @@ describe "TorqueBox.configure using the GlobalConfiguration" do
375
376
  'foo' => { :type => :bounded, :min => 1, :max => 2 } },
376
377
  'queue' => {
377
378
  'a-queue' => {
378
- :create => false,
379
- 'processor' => [ [ FakeConstant.new( 'AProcessor' ),
380
- {
381
- :name => 'a-proc',
382
- :config => { :foo => :bar } } ] ]
379
+ :create => false
383
380
  },
384
381
  'another-queue' => {},
385
382
  },
@@ -397,8 +394,15 @@ describe "TorqueBox.configure using the GlobalConfiguration" do
397
394
  [ FakeConstant.new( 'AnotherStomplet' ), {
398
395
  :route => '/b',
399
396
  :config => { :foo => :bar } } ] ],
400
- 'topic' => { 'a-topic' => { :durable => true } },
401
- 'web' => { :context => '/bacon' }
397
+ 'topic' => { 'a-topic' => {
398
+ :durable => true,
399
+ 'processor' => [ [ FakeConstant.new( 'AProcessor' ),
400
+ {
401
+ :name => 'a-proc',
402
+ :durable => true,
403
+ :client_id => 'client-id',
404
+ :config => { :foo => :bar } } ] ] } },
405
+ 'web' => { :context => '/bacon' }
402
406
  }
403
407
 
404
408
  @metadata = @config.to_metadata_hash
@@ -442,7 +446,12 @@ describe "TorqueBox.configure using the GlobalConfiguration" do
442
446
  end
443
447
 
444
448
  it "should properly set a processor" do
445
- @metadata['messaging']['a-queue']['AProcessor'].should == { "name" => 'a-proc', "config" => { 'foo' => :bar } }
449
+ @metadata['messaging']['a-topic']['AProcessor'].should == {
450
+ "name" => 'a-proc',
451
+ "durable" => true,
452
+ "client_id" => 'client-id',
453
+ "config" => { 'foo' => :bar }
454
+ }
446
455
  end
447
456
 
448
457
  it "should properly set a queue" do
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: torquebox-configure
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease: 6
5
- version: 2.0.0.beta1
5
+ version: 2.0.0.beta2
6
6
  platform: java
7
7
  authors:
8
8
  - The TorqueBox Team
@@ -10,7 +10,7 @@ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
12
 
13
- date: 2011-12-02 00:00:00 Z
13
+ date: 2012-01-05 00:00:00 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: blankslate