trinidad_jars 0.3.0 → 0.3.1
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.
- data/README.rdoc +1 -1
- data/lib/trinidad/jars.rb +1 -1
- data/spec/trinidad/server_spec.rb +10 -5
- data/trinidad-libs/tomcat-core.jar +0 -0
- metadata +4 -4
data/README.rdoc
CHANGED
|
@@ -47,7 +47,7 @@ Trinidad allows you to configure some parameters when the server is started from
|
|
|
47
47
|
* -t, --threadsafe => shortcut to work in threadsafe mode. Setting jruby_min_runtimes and jruby_max_runtimes to 1 in the configuration file the server behaves as the same way.
|
|
48
48
|
* -l, --load EXTENSION_NAME => loads an extension to use its command line options.
|
|
49
49
|
|
|
50
|
-
The server can also be configured from a yaml file. If a file is not especified, the server tries to load the file <em>config/
|
|
50
|
+
The server can also be configured from a yaml file. If a file is not especified, the server tries to load the file <em>config/trinidad.yml</em>. Within this file you can add other options like jruby.min.runtimes(:jruby_min_runtimes) or jruby.max.runtimes(:jruby_max_runtimes).
|
|
51
51
|
|
|
52
52
|
jruby -S trinidad -f
|
|
53
53
|
jruby -S trinidad --config my_custom_configuration.yml
|
data/lib/trinidad/jars.rb
CHANGED
|
@@ -4,7 +4,7 @@ $:.unshift(TRINIDAD_LIBS) unless
|
|
|
4
4
|
|
|
5
5
|
module Trinidad
|
|
6
6
|
require 'tomcat-core'
|
|
7
|
-
TOMCAT_VERSION = '7.0.
|
|
7
|
+
TOMCAT_VERSION = '7.0.2' unless defined?(Trinidad::TOMCAT_VERSION)
|
|
8
8
|
|
|
9
9
|
module Tomcat
|
|
10
10
|
include_package 'org.apache.catalina'
|
|
@@ -28,11 +28,16 @@ describe Trinidad::Server do
|
|
|
28
28
|
end
|
|
29
29
|
|
|
30
30
|
it "enables ssl when config param is a number" do
|
|
31
|
-
|
|
32
|
-
:
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
31
|
+
begin
|
|
32
|
+
server = Trinidad::Server.new({:ssl => {:port => 8443},
|
|
33
|
+
:web_app_dir => MOCK_WEB_APP_DIR})
|
|
34
|
+
|
|
35
|
+
server.ssl_enabled?.should be_true
|
|
36
|
+
File.exist?('ssl').should be_true
|
|
37
|
+
ensure
|
|
38
|
+
require 'fileutils'
|
|
39
|
+
FileUtils.rm_rf(File.expand_path('../../ssl', File.dirname(__FILE__)))
|
|
40
|
+
end
|
|
36
41
|
end
|
|
37
42
|
|
|
38
43
|
it "enables ajp when config param is a number" do
|
|
Binary file
|
metadata
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: trinidad_jars
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
hash:
|
|
4
|
+
hash: 17
|
|
5
5
|
prerelease: false
|
|
6
6
|
segments:
|
|
7
7
|
- 0
|
|
8
8
|
- 3
|
|
9
|
-
-
|
|
10
|
-
version: 0.3.
|
|
9
|
+
- 1
|
|
10
|
+
version: 0.3.1
|
|
11
11
|
platform: ruby
|
|
12
12
|
authors:
|
|
13
13
|
- David Calavera
|
|
@@ -15,7 +15,7 @@ autorequire:
|
|
|
15
15
|
bindir: bin
|
|
16
16
|
cert_chain: []
|
|
17
17
|
|
|
18
|
-
date: 2010-
|
|
18
|
+
date: 2010-09-12 00:00:00 +02:00
|
|
19
19
|
default_executable: trinidad
|
|
20
20
|
dependencies: []
|
|
21
21
|
|