trinidad 0.9.11 → 0.9.12

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. data/History.txt +5 -0
  2. data/lib/trinidad/web_app.rb +20 -6
  3. data/lib/trinidad/web_app_lifecycle_listener.rb +2 -5
  4. data/lib/trinidad.rb +1 -1
  5. metadata +114 -99
data/History.txt CHANGED
@@ -1,3 +1,8 @@
1
+ == 0.9.12 (2010-10-21)
2
+
3
+ * fix problems loading tomcat classes from rack application
4
+ * fix xml parsing of web.xml. Thanks to Karol Bucek
5
+
1
6
  == 0.9.11 (2010-10-20)
2
7
 
3
8
  * configure applications base directory to run several applications into the same container
data/lib/trinidad/web_app.rb CHANGED
@@ -36,12 +36,17 @@ module Trinidad
36
36
  end
37
37
 
38
38
  def rack_servlet_configured?
39
- !!(web_xml && (web_xml.include?('<servlet-class>org.jruby.rack.RackServlet') ||
40
- web_xml.include?('<filter-class>org.jruby.rack.RackFilter')))
39
+ !!( web_xml && (
40
+ web_xml.root.elements["/web-app/servlet[contains(servlet-class, 'org.jruby.rack.RackServlet')]"] ||
41
+ web_xml.root.elements["/web-app/filter[contains(filter-class, 'org.jruby.rack.RackFilter')]"]
42
+ )
43
+ )
41
44
  end
42
45
 
43
46
  def rack_listener_configured?
44
- !!(web_xml && web_xml.include?("<listener-class>#{context_listener}"))
47
+ !!( web_xml &&
48
+ web_xml.root.elements["/web-app/listener[contains(listener-class, '#{context_listener}')]"]
49
+ )
45
50
  end
46
51
 
47
52
  def public_root
@@ -71,12 +76,21 @@ module Trinidad
71
76
 
72
77
  private
73
78
  def web_xml
74
- @web_xml ||= File.read(default_deployment_descriptor).gsub(/\s+/, '') unless default_deployment_descriptor.nil?
79
+ return nil if @web_xml == false
80
+ @web_xml ||=
81
+ begin
82
+ require 'rexml/document'
83
+ REXML::Document.new( File.read(default_deployment_descriptor) )
84
+ rescue REXML::ParseException => e
85
+ puts "WARNING: invalid deployment descriptor:[#{default_deployment_descriptor}]"
86
+ puts e.message
87
+ false
88
+ end unless default_deployment_descriptor.nil?
75
89
  end
76
90
 
77
91
  def web_context_param(param)
78
- if web_xml =~ /<context-param><param-name>#{param}<\/param-name><param-value>(.+)<\/param-value>/
79
- return $1
92
+ if web_xml && param = web_xml.root.elements["/web-app/context-param[contains(param-name, '#{param}')]"]
93
+ param.elements['param-value'].text
80
94
  end
81
95
  end
82
96
 
data/lib/trinidad/web_app_lifecycle_listener.rb CHANGED
@@ -1,9 +1,6 @@
1
1
  module Trinidad
2
- import org.apache.catalina.LifecycleListener
3
- import org.apache.catalina.Lifecycle
4
-
5
2
  class WebAppLifecycleListener
6
- include LifecycleListener
3
+ include Trinidad::Tomcat::LifecycleListener
7
4
 
8
5
  attr_reader :context
9
6
 
@@ -12,7 +9,7 @@ module Trinidad
12
9
  end
13
10
 
14
11
  def lifecycleEvent(event)
15
- if Lifecycle::BEFORE_START_EVENT == event.type
12
+ if Trinidad::Tomcat::Lifecycle::BEFORE_START_EVENT == event.type
16
13
  init_defaults(event.lifecycle)
17
14
  end
18
15
  end
data/lib/trinidad.rb CHANGED
@@ -22,5 +22,5 @@ require 'trinidad/rackup_web_app'
22
22
 
23
23
 
24
24
  module Trinidad
25
- VERSION = '0.9.11'
25
+ VERSION = '0.9.12'
26
26
  end
metadata CHANGED
@@ -1,136 +1,151 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: trinidad
3
3
  version: !ruby/object:Gem::Version
4
+ hash: 35
4
5
  prerelease: false
5
6
  segments:
6
- - 0
7
- - 9
8
- - 11
9
- version: 0.9.11
7
+ - 0
8
+ - 9
9
+ - 12
10
+ version: 0.9.12
10
11
  platform: ruby
11
12
  authors:
12
- - David Calavera
13
+ - David Calavera
13
14
  autorequire:
14
15
  bindir: bin
15
16
  cert_chain: []
16
17
 
17
- date: 2010-10-20 00:00:00 +02:00
18
+ date: 2010-10-22 00:00:00 +02:00
18
19
  default_executable: trinidad
19
20
  dependencies:
20
- - !ruby/object:Gem::Dependency
21
- name: trinidad_jars
22
- prerelease: false
23
- requirement: &id001 !ruby/object:Gem::Requirement
24
- requirements:
25
- - - ">="
26
- - !ruby/object:Gem::Version
27
- segments:
28
- - 0
29
- - 3
30
- - 0
31
- version: 0.3.0
32
- type: :runtime
33
- version_requirements: *id001
34
- - !ruby/object:Gem::Dependency
35
- name: jruby-rack
36
- prerelease: false
37
- requirement: &id002 !ruby/object:Gem::Requirement
38
- requirements:
39
- - - ">="
40
- - !ruby/object:Gem::Version
41
- segments:
42
- - 1
43
- - 0
44
- - 2
45
- version: 1.0.2
46
- type: :runtime
47
- version_requirements: *id002
48
- - !ruby/object:Gem::Dependency
49
- name: rspec
50
- prerelease: false
51
- requirement: &id003 !ruby/object:Gem::Requirement
52
- requirements:
53
- - - ">="
54
- - !ruby/object:Gem::Version
55
- segments:
56
- - 0
57
- version: "0"
58
- type: :development
59
- version_requirements: *id003
60
- - !ruby/object:Gem::Dependency
61
- name: mocha
62
- prerelease: false
63
- requirement: &id004 !ruby/object:Gem::Requirement
64
- requirements:
65
- - - ">="
66
- - !ruby/object:Gem::Version
67
- segments:
68
- - 0
69
- version: "0"
70
- type: :development
71
- version_requirements: *id004
72
- - !ruby/object:Gem::Dependency
73
- name: fakefs
74
- prerelease: false
75
- requirement: &id005 !ruby/object:Gem::Requirement
76
- requirements:
77
- - - ">="
78
- - !ruby/object:Gem::Version
79
- segments:
80
- - 0
81
- version: "0"
82
- type: :development
83
- version_requirements: *id005
21
+ - !ruby/object:Gem::Dependency
22
+ name: trinidad_jars
23
+ prerelease: false
24
+ requirement: &id001 !ruby/object:Gem::Requirement
25
+ none: false
26
+ requirements:
27
+ - - ">="
28
+ - !ruby/object:Gem::Version
29
+ hash: 19
30
+ segments:
31
+ - 0
32
+ - 3
33
+ - 0
34
+ version: 0.3.0
35
+ type: :runtime
36
+ version_requirements: *id001
37
+ - !ruby/object:Gem::Dependency
38
+ name: jruby-rack
39
+ prerelease: false
40
+ requirement: &id002 !ruby/object:Gem::Requirement
41
+ none: false
42
+ requirements:
43
+ - - ">="
44
+ - !ruby/object:Gem::Version
45
+ hash: 19
46
+ segments:
47
+ - 1
48
+ - 0
49
+ - 2
50
+ version: 1.0.2
51
+ type: :runtime
52
+ version_requirements: *id002
53
+ - !ruby/object:Gem::Dependency
54
+ name: rspec
55
+ prerelease: false
56
+ requirement: &id003 !ruby/object:Gem::Requirement
57
+ none: false
58
+ requirements:
59
+ - - ">="
60
+ - !ruby/object:Gem::Version
61
+ hash: 3
62
+ segments:
63
+ - 0
64
+ version: "0"
65
+ type: :development
66
+ version_requirements: *id003
67
+ - !ruby/object:Gem::Dependency
68
+ name: mocha
69
+ prerelease: false
70
+ requirement: &id004 !ruby/object:Gem::Requirement
71
+ none: false
72
+ requirements:
73
+ - - ">="
74
+ - !ruby/object:Gem::Version
75
+ hash: 3
76
+ segments:
77
+ - 0
78
+ version: "0"
79
+ type: :development
80
+ version_requirements: *id004
81
+ - !ruby/object:Gem::Dependency
82
+ name: fakefs
83
+ prerelease: false
84
+ requirement: &id005 !ruby/object:Gem::Requirement
85
+ none: false
86
+ requirements:
87
+ - - ">="
88
+ - !ruby/object:Gem::Version
89
+ hash: 3
90
+ segments:
91
+ - 0
92
+ version: "0"
93
+ type: :development
94
+ version_requirements: *id005
84
95
  description: Trinidad allows you to run a rails or rackup applications within an embedded Apache Tomcat container
85
96
  email: calavera@apache.org
86
97
  executables:
87
- - trinidad
98
+ - trinidad
88
99
  extensions: []
89
100
 
90
101
  extra_rdoc_files:
91
- - README.rdoc
92
- - LICENSE
102
+ - README.rdoc
103
+ - LICENSE
93
104
  files:
94
- - bin/trinidad
95
- - lib/trinidad.rb
96
- - History.txt
97
- - LICENSE
98
- - README.rdoc
99
- - lib/trinidad/command_line_parser.rb
100
- - lib/trinidad/core_ext.rb
101
- - lib/trinidad/extensions.rb
102
- - lib/trinidad/rackup_web_app.rb
103
- - lib/trinidad/rails_web_app.rb
104
- - lib/trinidad/server.rb
105
- - lib/trinidad/web_app.rb
106
- - lib/trinidad/web_app_lifecycle_listener.rb
105
+ - bin/trinidad
106
+ - lib/trinidad.rb
107
+ - History.txt
108
+ - LICENSE
109
+ - README.rdoc
110
+ - lib/trinidad/command_line_parser.rb
111
+ - lib/trinidad/core_ext.rb
112
+ - lib/trinidad/extensions.rb
113
+ - lib/trinidad/rackup_web_app.rb
114
+ - lib/trinidad/rails_web_app.rb
115
+ - lib/trinidad/server.rb
116
+ - lib/trinidad/web_app.rb
117
+ - lib/trinidad/web_app_lifecycle_listener.rb
107
118
  has_rdoc: true
108
119
  homepage: http://github.com/calavera/trinidad
109
120
  licenses: []
110
121
 
111
122
  post_install_message:
112
123
  rdoc_options:
113
- - --charset=UTF-8
124
+ - --charset=UTF-8
114
125
  require_paths:
115
- - lib
126
+ - lib
116
127
  required_ruby_version: !ruby/object:Gem::Requirement
128
+ none: false
117
129
  requirements:
118
- - - ">="
119
- - !ruby/object:Gem::Version
120
- segments:
121
- - 0
122
- version: "0"
130
+ - - ">="
131
+ - !ruby/object:Gem::Version
132
+ hash: 3
133
+ segments:
134
+ - 0
135
+ version: "0"
123
136
  required_rubygems_version: !ruby/object:Gem::Requirement
137
+ none: false
124
138
  requirements:
125
- - - ">="
126
- - !ruby/object:Gem::Version
127
- segments:
128
- - 0
129
- version: "0"
139
+ - - ">="
140
+ - !ruby/object:Gem::Version
141
+ hash: 3
142
+ segments:
143
+ - 0
144
+ version: "0"
130
145
  requirements: []
131
146
 
132
147
  rubyforge_project: trinidad
133
- rubygems_version: 1.3.6
148
+ rubygems_version: 1.3.7
134
149
  signing_key:
135
150
  specification_version: 2
136
151
  summary: Simple library to run rails applications into an embedded Tomcat