trinidad 0.9.2 → 0.9.3
Sign up to get free protection for your applications and to get access to all the features.
- data/History.txt +6 -0
- data/README.rdoc +2 -1
- data/VERSION +1 -1
- data/lib/trinidad.rb +0 -1
- data/lib/trinidad/server.rb +8 -5
- metadata +32 -6
data/History.txt
CHANGED
@@ -1,3 +1,9 @@
|
|
1
|
+
== 0.9.3 (2010-07-27)
|
2
|
+
|
3
|
+
* Tomcat updated to version 7.0.0
|
4
|
+
* fix TRINIDAD-9: Tomcat SSL configure options keystore and keystoreFile
|
5
|
+
* fix TRINIDAD-10: When a web.xml is provided the tomcat's context doesn't start properly
|
6
|
+
|
1
7
|
== 0.9.2 (2010-05-24)
|
2
8
|
|
3
9
|
* Autoload the rackup file when it's under the directory WEB-INF.
|
data/README.rdoc
CHANGED
@@ -7,7 +7,6 @@ This project was initially called "Tomcat-rails" but due to legal issues with th
|
|
7
7
|
== INSTALL:
|
8
8
|
|
9
9
|
jgem install trinidad
|
10
|
-
jgem install calavera-trinidad -s http://gems.github.com
|
11
10
|
|
12
11
|
== USAGE:
|
13
12
|
|
@@ -64,6 +63,8 @@ From the version 0.8.0 Trinidad allows to extend the server with more Tomcat fea
|
|
64
63
|
* Database connection pooling: http://github.com/calavera/trinidad-dbpool
|
65
64
|
* Daemon, run Trinidad as a daemon: http://github.com/calavera/trinidad_daemon_extension
|
66
65
|
* Hot deploy, do hot deploys monitorizing a temporal file, ala Passenger: http://github.com/calavera/trinidad_hotdeploy_extension
|
66
|
+
* Sandbox, management console and REST api: http://github.com/calavera/trinidad_sandbox_extension
|
67
|
+
* Logging, enhance the Trinidad's logging system: http://github.com/calavera/trinidad_logging_extension
|
67
68
|
|
68
69
|
You can find further information on how to write your own extension in the wiki: http://wiki.github.com/calavera/trinidad/extensions
|
69
70
|
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.9.
|
1
|
+
0.9.3
|
data/lib/trinidad.rb
CHANGED
data/lib/trinidad/server.rb
CHANGED
@@ -88,8 +88,10 @@ module Trinidad
|
|
88
88
|
:SSLEnabled => 'true'
|
89
89
|
})
|
90
90
|
|
91
|
-
|
92
|
-
|
91
|
+
options[:keystoreFile] ||= options.delete(:keystore)
|
92
|
+
|
93
|
+
if !options[:keystoreFile] && !options[:SSLCertificateFile]
|
94
|
+
options[:keystoreFile] = 'ssl/keystore'
|
93
95
|
options[:keystorePass] = 'waduswadus'
|
94
96
|
end
|
95
97
|
|
@@ -119,9 +121,10 @@ module Trinidad
|
|
119
121
|
end
|
120
122
|
|
121
123
|
def create_default_keystore(config)
|
122
|
-
|
124
|
+
keystore_file_path = config[:keystoreFile]
|
125
|
+
return unless keystore_file_path && File.exist?(keystore_file_path)
|
123
126
|
|
124
|
-
keystore_file = java.io.File.new(
|
127
|
+
keystore_file = java.io.File.new(keystore_file)
|
125
128
|
|
126
129
|
if (!keystore_file.parent_file.exists &&
|
127
130
|
!keystore_file.parent_file.mkdir)
|
@@ -134,7 +137,7 @@ module Trinidad
|
|
134
137
|
"-keyalg", "RSA",
|
135
138
|
"-validity", "365",
|
136
139
|
"-storepass", "key",
|
137
|
-
"-keystore",
|
140
|
+
"-keystore", keystore_file_path,
|
138
141
|
"-storepass", config[:keystorePass],
|
139
142
|
"-keypass", config[:keystorePass]]
|
140
143
|
|
metadata
CHANGED
@@ -1,12 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: trinidad
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
+
hash: 61
|
4
5
|
prerelease: false
|
5
6
|
segments:
|
6
7
|
- 0
|
7
8
|
- 9
|
8
|
-
-
|
9
|
-
version: 0.9.
|
9
|
+
- 3
|
10
|
+
version: 0.9.3
|
10
11
|
platform: ruby
|
11
12
|
authors:
|
12
13
|
- David Calavera
|
@@ -14,16 +15,18 @@ autorequire:
|
|
14
15
|
bindir: bin
|
15
16
|
cert_chain: []
|
16
17
|
|
17
|
-
date: 2010-
|
18
|
+
date: 2010-07-27 00:00:00 +02:00
|
18
19
|
default_executable: trinidad
|
19
20
|
dependencies:
|
20
21
|
- !ruby/object:Gem::Dependency
|
21
22
|
name: rack
|
22
23
|
prerelease: false
|
23
24
|
requirement: &id001 !ruby/object:Gem::Requirement
|
25
|
+
none: false
|
24
26
|
requirements:
|
25
27
|
- - ">="
|
26
28
|
- !ruby/object:Gem::Version
|
29
|
+
hash: 15
|
27
30
|
segments:
|
28
31
|
- 1
|
29
32
|
- 0
|
@@ -34,9 +37,11 @@ dependencies:
|
|
34
37
|
name: jruby-rack
|
35
38
|
prerelease: false
|
36
39
|
requirement: &id002 !ruby/object:Gem::Requirement
|
40
|
+
none: false
|
37
41
|
requirements:
|
38
42
|
- - ">="
|
39
43
|
- !ruby/object:Gem::Version
|
44
|
+
hash: 21
|
40
45
|
segments:
|
41
46
|
- 1
|
42
47
|
- 0
|
@@ -48,23 +53,27 @@ dependencies:
|
|
48
53
|
name: trinidad_jars
|
49
54
|
prerelease: false
|
50
55
|
requirement: &id003 !ruby/object:Gem::Requirement
|
56
|
+
none: false
|
51
57
|
requirements:
|
52
58
|
- - ">="
|
53
59
|
- !ruby/object:Gem::Version
|
60
|
+
hash: 19
|
54
61
|
segments:
|
55
62
|
- 0
|
56
|
-
-
|
63
|
+
- 3
|
57
64
|
- 0
|
58
|
-
version: 0.
|
65
|
+
version: 0.3.0
|
59
66
|
type: :runtime
|
60
67
|
version_requirements: *id003
|
61
68
|
- !ruby/object:Gem::Dependency
|
62
69
|
name: rspec
|
63
70
|
prerelease: false
|
64
71
|
requirement: &id004 !ruby/object:Gem::Requirement
|
72
|
+
none: false
|
65
73
|
requirements:
|
66
74
|
- - ">="
|
67
75
|
- !ruby/object:Gem::Version
|
76
|
+
hash: 3
|
68
77
|
segments:
|
69
78
|
- 0
|
70
79
|
version: "0"
|
@@ -74,9 +83,11 @@ dependencies:
|
|
74
83
|
name: mocha
|
75
84
|
prerelease: false
|
76
85
|
requirement: &id005 !ruby/object:Gem::Requirement
|
86
|
+
none: false
|
77
87
|
requirements:
|
78
88
|
- - ">="
|
79
89
|
- !ruby/object:Gem::Version
|
90
|
+
hash: 3
|
80
91
|
segments:
|
81
92
|
- 0
|
82
93
|
version: "0"
|
@@ -86,9 +97,11 @@ dependencies:
|
|
86
97
|
name: fakefs
|
87
98
|
prerelease: false
|
88
99
|
requirement: &id006 !ruby/object:Gem::Requirement
|
100
|
+
none: false
|
89
101
|
requirements:
|
90
102
|
- - ">="
|
91
103
|
- !ruby/object:Gem::Version
|
104
|
+
hash: 3
|
92
105
|
segments:
|
93
106
|
- 0
|
94
107
|
version: "0"
|
@@ -118,6 +131,15 @@ files:
|
|
118
131
|
- lib/trinidad/server.rb
|
119
132
|
- lib/trinidad/web_app.rb
|
120
133
|
- lib/trinidad/web_app_lifecycle_listener.rb
|
134
|
+
- spec/fixtures/trinidad_foo_extension.rb
|
135
|
+
- spec/fixtures/trinidad_override_tomcat_extension.rb
|
136
|
+
- spec/spec_helper.rb
|
137
|
+
- spec/trinidad/command_line_parser_spec.rb
|
138
|
+
- spec/trinidad/extensions_spec.rb
|
139
|
+
- spec/trinidad/fakeapp.rb
|
140
|
+
- spec/trinidad/server_spec.rb
|
141
|
+
- spec/trinidad/web_app_lifecycle_listener_spec.rb
|
142
|
+
- spec/trinidad/web_app_spec.rb
|
121
143
|
has_rdoc: true
|
122
144
|
homepage: http://calavera.github.com/trinidad
|
123
145
|
licenses: []
|
@@ -128,23 +150,27 @@ rdoc_options:
|
|
128
150
|
require_paths:
|
129
151
|
- lib
|
130
152
|
required_ruby_version: !ruby/object:Gem::Requirement
|
153
|
+
none: false
|
131
154
|
requirements:
|
132
155
|
- - ">="
|
133
156
|
- !ruby/object:Gem::Version
|
157
|
+
hash: 3
|
134
158
|
segments:
|
135
159
|
- 0
|
136
160
|
version: "0"
|
137
161
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
162
|
+
none: false
|
138
163
|
requirements:
|
139
164
|
- - ">="
|
140
165
|
- !ruby/object:Gem::Version
|
166
|
+
hash: 3
|
141
167
|
segments:
|
142
168
|
- 0
|
143
169
|
version: "0"
|
144
170
|
requirements: []
|
145
171
|
|
146
172
|
rubyforge_project: trinidad
|
147
|
-
rubygems_version: 1.3.
|
173
|
+
rubygems_version: 1.3.7
|
148
174
|
signing_key:
|
149
175
|
specification_version: 3
|
150
176
|
summary: Simple library to run rails applications into an embedded Tomcat
|