warbler 2.1.0 → 2.1.2
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.
- checksums.yaml +4 -4
- data/{History.txt → CHANGELOG.md} +63 -45
- data/Gemfile +5 -7
- data/LICENSE.txt +4 -6
- data/Mavenfile +16 -23
- data/README.rdoc +56 -13
- data/Rakefile +1 -3
- data/ext/JarMain.java +99 -98
- data/ext/WarMain.java +62 -82
- data/lib/warbler/bundler_helper.rb +1 -8
- data/lib/warbler/config.rb +11 -11
- data/lib/warbler/gems.rb +3 -7
- data/lib/warbler/jar.rb +3 -12
- data/lib/warbler/task.rb +8 -5
- data/lib/warbler/templates/bundler.erb +0 -3
- data/lib/warbler/templates/jar.erb +4 -2
- data/lib/warbler/templates/war.erb +3 -1
- data/lib/warbler/traits/bundler.rb +75 -42
- data/lib/warbler/traits/gemspec.rb +4 -0
- data/lib/warbler/traits/jar.rb +5 -5
- data/lib/warbler/traits/jbundler.rb +2 -1
- data/lib/warbler/traits/nogemspec.rb +5 -1
- data/lib/warbler/traits/rack.rb +5 -1
- data/lib/warbler/traits/rails.rb +4 -0
- data/lib/warbler/traits/war.rb +4 -0
- data/lib/warbler/traits.rb +29 -5
- data/lib/warbler/version.rb +1 -1
- data/lib/warbler/web_server.rb +3 -1
- data/lib/warbler_jar.jar +0 -0
- data/warble.rb +27 -10
- data/warbler.gemspec +10 -4
- data/web.xml.erb +0 -19
- metadata +73 -20
- data/lib/warbler/war.rb +0 -8
data/warbler.gemspec
CHANGED
|
@@ -32,10 +32,16 @@ bundle up all of your application files for deployment to a Java environment.}
|
|
|
32
32
|
|
|
33
33
|
gem.add_runtime_dependency 'rake', ['~> 13.0', '>= 13.0.3']
|
|
34
34
|
gem.add_runtime_dependency 'rexml', '~> 3.0'
|
|
35
|
-
gem.add_runtime_dependency 'jruby-jars', ['>= 9.4', '< 10.
|
|
36
|
-
gem.add_runtime_dependency 'jruby-rack', ['>= 1.2.
|
|
37
|
-
gem.add_runtime_dependency 'rubyzip', '>=
|
|
35
|
+
gem.add_runtime_dependency 'jruby-jars', ['>= 9.4', '< 10.2']
|
|
36
|
+
gem.add_runtime_dependency 'jruby-rack', ['>= 1.2.7', '< 2.1']
|
|
37
|
+
gem.add_runtime_dependency 'rubyzip', ['>= 2.1.0', '< 4']
|
|
38
38
|
gem.add_runtime_dependency 'ostruct', '~> 0.6.2'
|
|
39
|
-
|
|
39
|
+
|
|
40
40
|
gem.add_development_dependency 'rspec', '~> 3.0'
|
|
41
|
+
gem.add_development_dependency 'drb', ['~> 2.2', '>= 2.2.3']
|
|
42
|
+
gem.add_development_dependency 'ruby-maven', '~> 3.9'
|
|
43
|
+
gem.add_development_dependency 'bigdecimal' # Needed workaround for maven-tools > vertus > axiom-types lack of explicit bigdecimal dependency for JRuby 10
|
|
44
|
+
|
|
45
|
+
# JBundler is unsupported on JRuby 10.1
|
|
46
|
+
gem.add_development_dependency 'jbundler', '~> 0.9.5' if RUBY_VERSION.to_f < 4.0
|
|
41
47
|
end
|
data/web.xml.erb
CHANGED
|
@@ -5,7 +5,6 @@
|
|
|
5
5
|
<!--
|
|
6
6
|
<display-name>Uncomment and put name :here: for Tomcat Dashboard</display-name>-->
|
|
7
7
|
|
|
8
|
-
<%# NOTE: to be renamed to servlet_context_params %>
|
|
9
8
|
<%- webxml.context_params.each do |name, value| -%>
|
|
10
9
|
<context-param>
|
|
11
10
|
<param-name><%= name %></param-name>
|
|
@@ -13,7 +12,6 @@
|
|
|
13
12
|
</context-param>
|
|
14
13
|
<%- end -%>
|
|
15
14
|
|
|
16
|
-
<%- if webxml.respond_to?(:servlet_filter) -%>
|
|
17
15
|
<filter>
|
|
18
16
|
<filter-name><%= webxml.servlet_filter_name %></filter-name>
|
|
19
17
|
<filter-class><%= webxml.servlet_filter %></filter-class>
|
|
@@ -23,29 +21,12 @@
|
|
|
23
21
|
<filter-name><%= webxml.servlet_filter_name %></filter-name>
|
|
24
22
|
<url-pattern><%= webxml.servlet_filter_url_pattern %></url-pattern>
|
|
25
23
|
</filter-mapping>
|
|
26
|
-
<%- else -%> <%# NOTE: due compatibility when warbler gets downgraded to 2.0.0 %>
|
|
27
|
-
<filter>
|
|
28
|
-
<filter-name>RackFilter</filter-name>
|
|
29
|
-
<filter-class>org.jruby.rack.RackFilter</filter-class>
|
|
30
|
-
<async-supported>true</async-supported>
|
|
31
|
-
</filter>
|
|
32
|
-
<filter-mapping>
|
|
33
|
-
<filter-name>RackFilter</filter-name>
|
|
34
|
-
<url-pattern>/*</url-pattern>
|
|
35
|
-
</filter-mapping>
|
|
36
|
-
<%- end -%>
|
|
37
24
|
|
|
38
|
-
<%- if webxml.respond_to?(:servlet_context_listeners) -%>
|
|
39
25
|
<%- webxml.servlet_context_listeners.each do |listener| -%>
|
|
40
26
|
<listener>
|
|
41
27
|
<listener-class><%= listener %></listener-class>
|
|
42
28
|
</listener>
|
|
43
29
|
<%- end -%>
|
|
44
|
-
<%- else -%> <%# NOTE: due compatibility when warbler gets downgraded to 2.0.0 %>
|
|
45
|
-
<listener>
|
|
46
|
-
<listener-class><%= webxml.servlet_context_listener %></listener-class>
|
|
47
|
-
</listener>
|
|
48
|
-
<%- end -%>
|
|
49
30
|
|
|
50
31
|
<%- [webxml.jndi].flatten.each do |jndi| -%>
|
|
51
32
|
<resource-ref>
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: warbler
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.1.
|
|
4
|
+
version: 2.1.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Nick Sieger
|
|
@@ -52,7 +52,7 @@ dependencies:
|
|
|
52
52
|
version: '9.4'
|
|
53
53
|
- - "<"
|
|
54
54
|
- !ruby/object:Gem::Version
|
|
55
|
-
version: '10.
|
|
55
|
+
version: '10.2'
|
|
56
56
|
type: :runtime
|
|
57
57
|
prerelease: false
|
|
58
58
|
version_requirements: !ruby/object:Gem::Requirement
|
|
@@ -62,41 +62,47 @@ dependencies:
|
|
|
62
62
|
version: '9.4'
|
|
63
63
|
- - "<"
|
|
64
64
|
- !ruby/object:Gem::Version
|
|
65
|
-
version: '10.
|
|
65
|
+
version: '10.2'
|
|
66
66
|
- !ruby/object:Gem::Dependency
|
|
67
67
|
name: jruby-rack
|
|
68
68
|
requirement: !ruby/object:Gem::Requirement
|
|
69
69
|
requirements:
|
|
70
70
|
- - ">="
|
|
71
71
|
- !ruby/object:Gem::Version
|
|
72
|
-
version: 1.2.
|
|
72
|
+
version: 1.2.7
|
|
73
73
|
- - "<"
|
|
74
74
|
- !ruby/object:Gem::Version
|
|
75
|
-
version: '1
|
|
75
|
+
version: '2.1'
|
|
76
76
|
type: :runtime
|
|
77
77
|
prerelease: false
|
|
78
78
|
version_requirements: !ruby/object:Gem::Requirement
|
|
79
79
|
requirements:
|
|
80
80
|
- - ">="
|
|
81
81
|
- !ruby/object:Gem::Version
|
|
82
|
-
version: 1.2.
|
|
82
|
+
version: 1.2.7
|
|
83
83
|
- - "<"
|
|
84
84
|
- !ruby/object:Gem::Version
|
|
85
|
-
version: '1
|
|
85
|
+
version: '2.1'
|
|
86
86
|
- !ruby/object:Gem::Dependency
|
|
87
87
|
name: rubyzip
|
|
88
88
|
requirement: !ruby/object:Gem::Requirement
|
|
89
89
|
requirements:
|
|
90
90
|
- - ">="
|
|
91
91
|
- !ruby/object:Gem::Version
|
|
92
|
-
version:
|
|
92
|
+
version: 2.1.0
|
|
93
|
+
- - "<"
|
|
94
|
+
- !ruby/object:Gem::Version
|
|
95
|
+
version: '4'
|
|
93
96
|
type: :runtime
|
|
94
97
|
prerelease: false
|
|
95
98
|
version_requirements: !ruby/object:Gem::Requirement
|
|
96
99
|
requirements:
|
|
97
100
|
- - ">="
|
|
98
101
|
- !ruby/object:Gem::Version
|
|
99
|
-
version:
|
|
102
|
+
version: 2.1.0
|
|
103
|
+
- - "<"
|
|
104
|
+
- !ruby/object:Gem::Version
|
|
105
|
+
version: '4'
|
|
100
106
|
- !ruby/object:Gem::Dependency
|
|
101
107
|
name: ostruct
|
|
102
108
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -112,33 +118,81 @@ dependencies:
|
|
|
112
118
|
- !ruby/object:Gem::Version
|
|
113
119
|
version: 0.6.2
|
|
114
120
|
- !ruby/object:Gem::Dependency
|
|
115
|
-
name:
|
|
121
|
+
name: rspec
|
|
116
122
|
requirement: !ruby/object:Gem::Requirement
|
|
117
123
|
requirements:
|
|
118
|
-
- -
|
|
124
|
+
- - "~>"
|
|
119
125
|
- !ruby/object:Gem::Version
|
|
120
|
-
version: 0
|
|
126
|
+
version: '3.0'
|
|
121
127
|
type: :development
|
|
122
128
|
prerelease: false
|
|
123
129
|
version_requirements: !ruby/object:Gem::Requirement
|
|
124
130
|
requirements:
|
|
125
|
-
- -
|
|
131
|
+
- - "~>"
|
|
126
132
|
- !ruby/object:Gem::Version
|
|
127
|
-
version: 0
|
|
133
|
+
version: '3.0'
|
|
128
134
|
- !ruby/object:Gem::Dependency
|
|
129
|
-
name:
|
|
135
|
+
name: drb
|
|
130
136
|
requirement: !ruby/object:Gem::Requirement
|
|
131
137
|
requirements:
|
|
132
138
|
- - "~>"
|
|
133
139
|
- !ruby/object:Gem::Version
|
|
134
|
-
version: '
|
|
140
|
+
version: '2.2'
|
|
141
|
+
- - ">="
|
|
142
|
+
- !ruby/object:Gem::Version
|
|
143
|
+
version: 2.2.3
|
|
135
144
|
type: :development
|
|
136
145
|
prerelease: false
|
|
137
146
|
version_requirements: !ruby/object:Gem::Requirement
|
|
138
147
|
requirements:
|
|
139
148
|
- - "~>"
|
|
140
149
|
- !ruby/object:Gem::Version
|
|
141
|
-
version: '
|
|
150
|
+
version: '2.2'
|
|
151
|
+
- - ">="
|
|
152
|
+
- !ruby/object:Gem::Version
|
|
153
|
+
version: 2.2.3
|
|
154
|
+
- !ruby/object:Gem::Dependency
|
|
155
|
+
name: ruby-maven
|
|
156
|
+
requirement: !ruby/object:Gem::Requirement
|
|
157
|
+
requirements:
|
|
158
|
+
- - "~>"
|
|
159
|
+
- !ruby/object:Gem::Version
|
|
160
|
+
version: '3.9'
|
|
161
|
+
type: :development
|
|
162
|
+
prerelease: false
|
|
163
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
164
|
+
requirements:
|
|
165
|
+
- - "~>"
|
|
166
|
+
- !ruby/object:Gem::Version
|
|
167
|
+
version: '3.9'
|
|
168
|
+
- !ruby/object:Gem::Dependency
|
|
169
|
+
name: bigdecimal
|
|
170
|
+
requirement: !ruby/object:Gem::Requirement
|
|
171
|
+
requirements:
|
|
172
|
+
- - ">="
|
|
173
|
+
- !ruby/object:Gem::Version
|
|
174
|
+
version: '0'
|
|
175
|
+
type: :development
|
|
176
|
+
prerelease: false
|
|
177
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
178
|
+
requirements:
|
|
179
|
+
- - ">="
|
|
180
|
+
- !ruby/object:Gem::Version
|
|
181
|
+
version: '0'
|
|
182
|
+
- !ruby/object:Gem::Dependency
|
|
183
|
+
name: jbundler
|
|
184
|
+
requirement: !ruby/object:Gem::Requirement
|
|
185
|
+
requirements:
|
|
186
|
+
- - "~>"
|
|
187
|
+
- !ruby/object:Gem::Version
|
|
188
|
+
version: 0.9.5
|
|
189
|
+
type: :development
|
|
190
|
+
prerelease: false
|
|
191
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
192
|
+
requirements:
|
|
193
|
+
- - "~>"
|
|
194
|
+
- !ruby/object:Gem::Version
|
|
195
|
+
version: 0.9.5
|
|
142
196
|
description: |-
|
|
143
197
|
Warbler is a gem to make a Java jar or war file out of any Ruby,
|
|
144
198
|
Rails, or Rack application. Warbler provides a minimal, flexible, Ruby-like way to
|
|
@@ -149,8 +203,8 @@ executables:
|
|
|
149
203
|
extensions: []
|
|
150
204
|
extra_rdoc_files: []
|
|
151
205
|
files:
|
|
206
|
+
- CHANGELOG.md
|
|
152
207
|
- Gemfile
|
|
153
|
-
- History.txt
|
|
154
208
|
- LICENSE.txt
|
|
155
209
|
- Mavenfile
|
|
156
210
|
- README.rdoc
|
|
@@ -189,7 +243,6 @@ files:
|
|
|
189
243
|
- lib/warbler/traits/rails.rb
|
|
190
244
|
- lib/warbler/traits/war.rb
|
|
191
245
|
- lib/warbler/version.rb
|
|
192
|
-
- lib/warbler/war.rb
|
|
193
246
|
- lib/warbler/web_server.rb
|
|
194
247
|
- lib/warbler/zip_support.rb
|
|
195
248
|
- lib/warbler_jar.jar
|
|
@@ -219,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
219
272
|
- !ruby/object:Gem::Version
|
|
220
273
|
version: '0'
|
|
221
274
|
requirements: []
|
|
222
|
-
rubygems_version: 3.
|
|
275
|
+
rubygems_version: 3.7.2
|
|
223
276
|
specification_version: 4
|
|
224
277
|
summary: Warbler chirpily constructs .war files of your Rails applications.
|
|
225
278
|
test_files: []
|