trinidad_jars 1.1.0 → 1.1.1

Sign up to get free protection for your applications and to get access to all the features.
data/lib/trinidad/jars.rb CHANGED
@@ -1,12 +1,10 @@
1
- TRINIDAD_LIBS = File.dirname(__FILE__) + "/../../trinidad-libs" unless defined?(TRINIDAD_LIBS)
2
- $:.unshift(TRINIDAD_LIBS) unless
3
- $:.include?(TRINIDAD_LIBS) || $:.include?(File.expand_path(TRINIDAD_LIBS))
1
+
2
+ load File.expand_path('../../trinidad-libs/tomcat-core.jar', File.dirname(__FILE__))
3
+ load File.expand_path('../../trinidad-libs/trinidad-rb.jar', File.dirname(__FILE__))
4
4
 
5
5
  module Trinidad
6
- require 'tomcat-core'
7
- require 'trinidad-rb'
8
- TRINIDAD_JARS_VERSION = '1.1.0'
9
- TOMCAT_VERSION = '7.0.30' unless defined?(Trinidad::TOMCAT_VERSION)
6
+ TRINIDAD_JARS_VERSION = '1.1.1'
7
+ TOMCAT_VERSION = '7.0.32' unless const_defined?(:TOMCAT_VERSION)
10
8
 
11
9
  module Tomcat
12
10
  include_package 'org.apache.catalina'
Binary file
@@ -3,7 +3,6 @@
3
3
 
4
4
  Gem::Specification.new do |s|
5
5
  s.name = 'trinidad_jars'
6
- s.rubyforge_project = 'trinidad_jars'
7
6
 
8
7
  file = File.expand_path("../lib/trinidad/jars.rb", __FILE__)
9
8
  line = File.read(file)[/^\s*TRINIDAD_JARS_VERSION\s*=\s*.*/]
@@ -16,11 +15,10 @@ Gem::Specification.new do |s|
16
15
  s.email = 'calavera@apache.org'
17
16
  s.homepage = 'http://github.com/trinidad/trinidad'
18
17
 
19
- s.require_paths = %w[lib]
18
+ s.require_paths = %w[lib] # due require 'trinidad/jars'
20
19
 
21
20
  s.files = `git ls-files`.split("\n").sort.
22
- select { |file| file == 'trinidad_jars.gemspec' ||
23
- file == 'lib/trinidad/jars.rb' ||
21
+ select { |file| file == 'trinidad_jars.gemspec' ||
22
+ file == 'lib/trinidad/jars.rb' ||
24
23
  file =~ /^trinidad-libs\// }
25
-
26
24
  end
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: trinidad_jars
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 1.1.0
5
+ version: 1.1.1
6
6
  platform: ruby
7
7
  authors:
8
8
  - David Calavera
@@ -10,7 +10,7 @@ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
12
 
13
- date: 2012-09-20 00:00:00 Z
13
+ date: 2012-10-17 00:00:00 Z
14
14
  dependencies: []
15
15
 
16
16
  description: Bundled version of Tomcat and a slice of Java required by Trinidad.
@@ -41,17 +41,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
41
41
  requirements:
42
42
  - - ">="
43
43
  - !ruby/object:Gem::Version
44
+ hash: 2
45
+ segments:
46
+ - 0
44
47
  version: "0"
45
48
  required_rubygems_version: !ruby/object:Gem::Requirement
46
49
  none: false
47
50
  requirements:
48
51
  - - ">="
49
52
  - !ruby/object:Gem::Version
53
+ hash: 2
54
+ segments:
55
+ - 0
50
56
  version: "0"
51
57
  requirements: []
52
58
 
53
- rubyforge_project: trinidad_jars
54
- rubygems_version: 1.8.15
59
+ rubyforge_project:
60
+ rubygems_version: 1.8.24
55
61
  signing_key:
56
62
  specification_version: 3
57
63
  summary: Jars packaged for Trinidad