torquebox-configure 2.2.0-java → 2.3.0-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 +1 -1
  5. data/lib/torquebox/configuration/global.rb +4 -1
  6. data/lib/torquebox/configuration/validator.rb +1 -1
  7. data/lib/torquebox/configure.rb +1 -1
  8. data/spec/global_spec.rb +22 -2
  9. metadata +6 -6
data/lib/gem_hook.rb CHANGED
@@ -1,4 +1,4 @@
1
- # Copyright 2008-2012 Red Hat, Inc, and individual contributors.
1
+ # Copyright 2008-2013 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.2.0'
3
- MAVEN_VERSION = '2.2.0'
2
+ VERSION = '2.3.0'
3
+ MAVEN_VERSION = '2.3.0'
4
4
  end
5
5
  begin
6
6
  require 'java'
data/lib/torquebox/configuration.rb CHANGED
@@ -1,4 +1,4 @@
1
- # Copyright 2008-2012 Red Hat, Inc, and individual contributors.
1
+ # Copyright 2008-2013 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/configuration/global.rb CHANGED
@@ -1,4 +1,4 @@
1
- # Copyright 2008-2012 Red Hat, Inc, and individual contributors.
1
+ # Copyright 2008-2013 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
@@ -56,6 +56,8 @@ module TorqueBox
56
56
  :optional => [
57
57
  :config,
58
58
  :name,
59
+ :description,
60
+ :timeout,
59
61
  { :singleton => [true, false] }
60
62
  ]
61
63
  }),
@@ -78,6 +80,7 @@ module TorqueBox
78
80
  :concurrency,
79
81
  { :singleton => [true, false] },
80
82
  { :durable => [true, false] },
83
+ { :xa => [true, false] },
81
84
  :client_id,
82
85
  :config,
83
86
  :selector,
data/lib/torquebox/configuration/validator.rb CHANGED
@@ -1,4 +1,4 @@
1
- # Copyright 2008-2012 Red Hat, Inc, and individual contributors.
1
+ # Copyright 2008-2013 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.rb CHANGED
@@ -1,4 +1,4 @@
1
- # Copyright 2008-2012 Red Hat, Inc, and individual contributors.
1
+ # Copyright 2008-2013 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/spec/global_spec.rb CHANGED
@@ -241,7 +241,7 @@ describe "TorqueBox.configure using the GlobalConfiguration" do
241
241
 
242
242
  it_should_allow_valid_options do
243
243
  topic 'a-topic' do
244
- processor 'AClass', :concurrency => 1, :config => '', :selector => '', :name => '', :durable => true, :client_id => 'client-id', :singleton=>true
244
+ processor 'AClass', :concurrency => 1, :config => '', :selector => '', :name => '', :durable => true, :client_id => 'client-id', :singleton=>true, :xa => true
245
245
  end
246
246
  end
247
247
 
@@ -335,7 +335,7 @@ describe "TorqueBox.configure using the GlobalConfiguration" do
335
335
  it_should_behave_like 'a thing with options'
336
336
 
337
337
  it_should_not_allow_invalid_options { job 'AClass', :foo => :bar }
338
- it_should_allow_valid_options { job 'AClass', :config => '', :singleton => true, :name => '' , :cron => '234'}
338
+ it_should_allow_valid_options { job 'AClass', :config => '', :singleton => true, :name => '' , :cron => '234', :description => 'A description'}
339
339
 
340
340
  it_should_not_allow_invalid_option_values { job 'AClass', :singleton => :bacon }
341
341
  it_should_allow_valid_option_values { job 'AClass', :singleton => false, :cron => '234' }
@@ -359,6 +359,24 @@ describe "TorqueBox.configure using the GlobalConfiguration" do
359
359
  ['Two::AJob', { :cron => '1234' }]]
360
360
  end
361
361
 
362
+ # https://issues.jboss.org/browse/TORQUE-986
363
+ it "should allow job description" do
364
+ config = TorqueBox.configure do
365
+ job 'AJob', :cron => '1234', :description => 'A description'
366
+ end
367
+
368
+ config['<root>']['job'].should == [['AJob', { :cron => '1234', :description => 'A description' }]]
369
+ end
370
+
371
+ # https://issues.jboss.org/browse/TORQUE-999
372
+ it "should allow job timeout" do
373
+ config = TorqueBox.configure do
374
+ job 'AJob', :cron => '1234', :timeout => '30s'
375
+ end
376
+
377
+ config['<root>']['job'].should == [['AJob', { :cron => '1234', :timeout => '30s' }]]
378
+ end
379
+
362
380
  it "should allow jobs as constants" do
363
381
  config = TorqueBox.configure do |cfg|
364
382
  cfg.instance_eval("job JobX, :cron => '1234'")
@@ -465,6 +483,7 @@ describe "TorqueBox.configure using the GlobalConfiguration" do
465
483
  :name => 'a-proc',
466
484
  :durable => true,
467
485
  :client_id => 'client-id',
486
+ :xa => false,
468
487
  :config => { :foo => :bar } } ] ] } },
469
488
  'web' => { :context => '/bacon',
470
489
  :host => ['host1', 'host2'],
@@ -521,6 +540,7 @@ describe "TorqueBox.configure using the GlobalConfiguration" do
521
540
  "name" => 'a-proc',
522
541
  "durable" => true,
523
542
  "client_id" => 'client-id',
543
+ "xa" => false,
524
544
  "config" => { 'foo' => :bar }
525
545
  }
526
546
  end
metadata CHANGED
@@ -2,14 +2,14 @@
2
2
  name: torquebox-configure
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 2.2.0
5
+ version: 2.3.0
6
6
  platform: java
7
7
  authors:
8
8
  - The TorqueBox Team
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-12-06 00:00:00.000000000 Z
12
+ date: 2013-01-25 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: blankslate
@@ -56,10 +56,10 @@ files:
56
56
  - lib/gem_hook.rb
57
57
  - lib/torquebox/configure.rb
58
58
  - lib/torquebox/configuration.rb
59
- - lib/torquebox/configuration/global.rb
60
59
  - lib/torquebox/configuration/validator.rb
61
- - spec/global_spec.rb
60
+ - lib/torquebox/configuration/global.rb
62
61
  - spec/options_macros.rb
62
+ - spec/global_spec.rb
63
63
  - spec/validator_spec.rb
64
64
  homepage: http://torquebox.org/
65
65
  licenses:
@@ -70,14 +70,14 @@ require_paths:
70
70
  - lib
71
71
  required_ruby_version: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - ! '>='
73
+ - - ">="
74
74
  - !ruby/object:Gem::Version
75
75
  version: !binary |-
76
76
  MA==
77
77
  none: false
78
78
  required_rubygems_version: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - ! '>='
80
+ - - ">="
81
81
  - !ruby/object:Gem::Version
82
82
  version: !binary |-
83
83
  MA==