rjack-solr 4.1.0.0-java → 4.2.1.0-java

Sign up to get free protection for your applications and to get access to all the features.
Files changed (40) hide show
  1. data/History.rdoc +5 -0
  2. data/Manifest.txt +7 -3
  3. data/Rakefile +1 -0
  4. data/init/rjack-solr +1 -1
  5. data/lib/rjack-solr/base.rb +1 -1
  6. data/lib/rjack-solr/org.restlet-2.1.1.jar +0 -0
  7. data/lib/rjack-solr/org.restlet.ext.servlet-2.1.1.jar +0 -0
  8. data/lib/rjack-solr/solr-core-4.2.1.jar +0 -0
  9. data/lib/rjack-solr/{solr-solrj-4.1.0.jar → solr-solrj-4.2.1.jar} +0 -0
  10. data/pom.xml +2 -2
  11. data/webapp/META-INF/MANIFEST.MF +3 -3
  12. data/webapp/META-INF/NOTICE.txt +12 -0
  13. data/webapp/WEB-INF/web.xml +14 -0
  14. data/webapp/admin.html +6 -2
  15. data/webapp/css/styles/analysis.css +2 -3
  16. data/webapp/css/styles/cloud.css +52 -0
  17. data/webapp/css/styles/common.css +1 -7
  18. data/webapp/css/styles/index.css +0 -5
  19. data/webapp/css/styles/menu.css +43 -30
  20. data/webapp/css/styles/schema-browser.css +99 -28
  21. data/webapp/img/ico/home.png +0 -0
  22. data/webapp/js/main.js +0 -1
  23. data/webapp/js/scripts/analysis.js +8 -5
  24. data/webapp/js/scripts/app.js +153 -37
  25. data/webapp/js/scripts/cores.js +1 -7
  26. data/webapp/js/scripts/dataimport.js +3 -8
  27. data/webapp/js/scripts/index.js +39 -32
  28. data/webapp/js/scripts/java-properties.js +1 -1
  29. data/webapp/js/scripts/logging.js +2 -2
  30. data/webapp/js/scripts/ping.js +1 -1
  31. data/webapp/js/scripts/plugins.js +2 -6
  32. data/webapp/js/scripts/query.js +2 -2
  33. data/webapp/js/scripts/schema-browser.js +148 -148
  34. data/webapp/js/scripts/threads.js +1 -1
  35. data/webapp/tpl/analysis.html +1 -1
  36. data/webapp/tpl/cloud.html +11 -0
  37. data/webapp/tpl/schema-browser.html +19 -11
  38. metadata +21 -13
  39. data/lib/rjack-solr/solr-core-4.1.0.jar +0 -0
  40. data/webapp/js/lib/jquery.sparkline.js +0 -1271
data/History.rdoc CHANGED
@@ -1,3 +1,8 @@
1
+ === 4.2.1.0 (2013-5-5)
2
+ * Upgrade to Solr 4.2.1
3
+ * Upgrades lucene ~> 4.2.1; rjack-jetty >= 7.6.9, < 9.1;
4
+ commons-codec >= 1.7.0, < 1.9.
5
+
1
6
  === 4.1.0.0 (2013-2-6)
2
7
  * Upgrade to Solr 4.1.0
3
8
  * Upgrades httpclient-4 ~> 4.2.3, zookeeper ~> 3.4.5,
data/Manifest.txt CHANGED
@@ -21,7 +21,9 @@ webapp/WEB-INF
21
21
  webapp/WEB-INF/lib
22
22
  webapp/WEB-INF/web.xml
23
23
  webapp/WEB-INF/weblogic.xml
24
+ webapp/admin
24
25
  webapp/admin.html
26
+ webapp/admin/replication
25
27
  webapp/css
26
28
  webapp/css/chosen.css
27
29
  webapp/css/styles
@@ -181,6 +183,7 @@ webapp/img/ico/hammer-screwdriver.png
181
183
  webapp/img/ico/hammer.png
182
184
  webapp/img/ico/hand.png
183
185
  webapp/img/ico/highlighter-text.png
186
+ webapp/img/ico/home.png
184
187
  webapp/img/ico/hourglass--exclamation.png
185
188
  webapp/img/ico/hourglass.png
186
189
  webapp/img/ico/inbox-document-text.png
@@ -263,7 +266,6 @@ webapp/js/lib/jquery.cookie.js
263
266
  webapp/js/lib/jquery.form.js
264
267
  webapp/js/lib/jquery.jstree.js
265
268
  webapp/js/lib/jquery.sammy.js
266
- webapp/js/lib/jquery.sparkline.js
267
269
  webapp/js/lib/jquery.timeago.js
268
270
  webapp/js/lib/linker.js
269
271
  webapp/js/lib/order.js
@@ -303,5 +305,7 @@ lib/rjack-solr/commons-cli-1.2.jar
303
305
  lib/rjack-solr/commons-fileupload-1.2.1.jar
304
306
  lib/rjack-solr/commons-io-2.1.jar
305
307
  lib/rjack-solr/commons-lang-2.6.jar
306
- lib/rjack-solr/solr-core-4.1.0.jar
307
- lib/rjack-solr/solr-solrj-4.1.0.jar
308
+ lib/rjack-solr/org.restlet-2.1.1.jar
309
+ lib/rjack-solr/org.restlet.ext.servlet-2.1.1.jar
310
+ lib/rjack-solr/solr-core-4.2.1.jar
311
+ lib/rjack-solr/solr-solrj-4.2.1.jar
data/Rakefile CHANGED
@@ -8,5 +8,6 @@ RJack::TarPit.new( 'rjack-solr' ) do |tp|
8
8
 
9
9
  tp.rdoc_destinations <<
10
10
  'dekellum@rubyforge.org:/var/www/gforge-projects/rjack/solr'
11
+ tp.publish_rdoc_rsync_flags = %w[ -rL ]
11
12
 
12
13
  end
data/init/rjack-solr CHANGED
@@ -23,7 +23,7 @@
23
23
  #++
24
24
 
25
25
  require 'rubygems'
26
- gem( "rjack-solr", "= 4.1.0.0" )
26
+ gem( "rjack-solr", "= 4.2.1.0" )
27
27
 
28
28
  module BinScript
29
29
 
@@ -18,7 +18,7 @@ module RJack
18
18
  module Solr
19
19
 
20
20
  # SOLR (java) version
21
- CORE_VERSION = '4.1.0'
21
+ CORE_VERSION = '4.2.1'
22
22
 
23
23
  # rjack gem version
24
24
  VERSION = CORE_VERSION + '.0'
Binary file
data/pom.xml CHANGED
@@ -15,7 +15,7 @@
15
15
  <dependency>
16
16
  <groupId>org.apache.solr</groupId>
17
17
  <artifactId>solr-core</artifactId>
18
- <version>4.1.0</version>
18
+ <version>4.2.1</version>
19
19
  <exclusions>
20
20
  <!-- <exclusion>
21
21
  <groupId>com.google.guava</groupId>
@@ -51,7 +51,7 @@
51
51
  <dependency>
52
52
  <groupId>org.apache.solr</groupId>
53
53
  <artifactId>solr</artifactId>
54
- <version>4.1.0</version>
54
+ <version>4.2.1</version>
55
55
  <type>war</type>
56
56
  </dependency>
57
57
  </dependencies>
@@ -1,12 +1,12 @@
1
1
  Manifest-Version: 1.0
2
2
  Ant-Version: Apache Ant 1.8.2
3
- Created-By: 1.6.0_37-b06-434-11M3909 (Apple Inc.)
3
+ Created-By: 1.6.0_27-b27 (Sun Microsystems Inc.)
4
4
  Extension-Name: org.apache.solr
5
5
  Specification-Title: Apache Solr Search Server
6
- Specification-Version: 4.1.0.2013.01.16.17.23.22
6
+ Specification-Version: 4.2.1.2013.03.26.08.28.55
7
7
  Specification-Vendor: The Apache Software Foundation
8
8
  Implementation-Title: org.apache.solr
9
- Implementation-Version: 4.1.0 1434440 - sarowe - 2013-01-16 17:23:22
9
+ Implementation-Version: 4.2.1 1461071 - mark - 2013-03-26 08:28:55
10
10
  Implementation-Vendor: The Apache Software Foundation
11
11
  X-Compile-Source-JDK: 1.6
12
12
  X-Compile-Target-JDK: 1.6
@@ -503,3 +503,15 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
503
503
  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
504
504
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
505
505
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
506
+
507
+ =========================================================================
508
+ == Restlet Notice ==
509
+ =========================================================================
510
+
511
+ Copyright (C) 2005-2013 Restlet S.A.S.
512
+
513
+ Restlet is a registered trademark of Restlet S.A.S.
514
+
515
+ This product contains software developed by the Restlet project.
516
+
517
+ See http://www.restlet.org/
@@ -125,6 +125,15 @@
125
125
  <param-value>${context}/#/~logging</param-value>
126
126
  </init-param>
127
127
  </servlet>
128
+
129
+ <servlet>
130
+ <servlet-name>SchemaRestApi</servlet-name>
131
+ <servlet-class>org.restlet.ext.servlet.ServerServlet</servlet-class>
132
+ <init-param>
133
+ <param-name>org.restlet.application</param-name>
134
+ <param-value>org.apache.solr.rest.SchemaRestApi</param-value>
135
+ </init-param>
136
+ </servlet>
128
137
 
129
138
  <servlet-mapping>
130
139
  <servlet-name>RedirectOldAdminUI</servlet-name>
@@ -153,6 +162,11 @@
153
162
  <servlet-name>LoadAdminUI</servlet-name>
154
163
  <url-pattern>/admin.html</url-pattern>
155
164
  </servlet-mapping>
165
+
166
+ <servlet-mapping>
167
+ <servlet-name>SchemaRestApi</servlet-name>
168
+ <url-pattern>/schema/*</url-pattern>
169
+ </servlet-mapping>
156
170
 
157
171
  <mime-mapping>
158
172
  <extension>.xsl</extension>
data/webapp/admin.html CHANGED
@@ -111,8 +111,12 @@ limitations under the License.
111
111
 
112
112
  </ul>
113
113
 
114
- <ul id="menu-selector">
115
- </ul>
114
+ <div id="core-selector">
115
+ <select data-placeholder="Core Selector"></select>
116
+ </div>
117
+ <div id="core-menu">
118
+ <ul></ul>
119
+ </div>
116
120
 
117
121
  </div>
118
122
  </div>
@@ -82,10 +82,9 @@
82
82
  float: right;
83
83
  }
84
84
 
85
- #content #analysis .settings button.loader
85
+ #content #analysis .settings button span
86
86
  {
87
- background-position: 2px 50%;
88
- padding-left: 21px;
87
+ background-image: url( ../../img/ico/funnel.png );
89
88
  }
90
89
 
91
90
  #content #analysis .settings .verbose_output
@@ -231,11 +231,39 @@
231
231
  color: #00f;
232
232
  }
233
233
 
234
+ #content #cloud #legend
235
+ {
236
+ border: 1px solid #f0f0f0;
237
+ padding: 10px;
238
+ position: absolute;
239
+ right: 0;
240
+ bottom: 0;
241
+ }
242
+
243
+ #content #cloud #legend li
244
+ {
245
+ padding-left: 15px;
246
+ position: relative;
247
+ }
248
+
249
+ #content #cloud #legend li svg
250
+ {
251
+ position: absolute;
252
+ left: 0;
253
+ top: 2px;
254
+ }
255
+
256
+ #content #graph-content
257
+ {
258
+ min-height: 400px;
259
+ }
260
+
234
261
  #content #graph-content .node
235
262
  {
236
263
  fill: #333;
237
264
  }
238
265
 
266
+ #content #cloud #legend circle,
239
267
  #content #graph-content .node circle
240
268
  {
241
269
  fill: #fff;
@@ -265,6 +293,7 @@
265
293
  stroke-width: 1.5px;
266
294
  }
267
295
 
296
+ #content #cloud #legend .gone circle,
268
297
  #content #graph-content .node.gone circle,
269
298
  #content #graph-content .link.gone
270
299
  {
@@ -276,8 +305,16 @@
276
305
  fill: #f0f0f0;
277
306
  }
278
307
 
308
+ #content #cloud #legend ul .gone
309
+ {
310
+ color: #e0e0e0;
311
+ }
312
+
313
+ #content #cloud #legend .recovery_failed,
314
+ #content #cloud #legend .recovery_failed circle,
279
315
  #content #graph-content .node.recovery_failed circle
280
316
  {
317
+ color: #C43C35;
281
318
  stroke: #C43C35;
282
319
  }
283
320
 
@@ -286,8 +323,11 @@
286
323
  fill: #C43C35;
287
324
  }
288
325
 
326
+ #content #cloud #legend .down,
327
+ #content #cloud #legend .down circle,
289
328
  #content #graph-content .node.down circle
290
329
  {
330
+ color: #c48f00;
291
331
  stroke: #c48f00;
292
332
  }
293
333
 
@@ -296,8 +336,11 @@
296
336
  fill: #c48f00;
297
337
  }
298
338
 
339
+ #content #cloud #legend .recovering,
340
+ #content #cloud #legend .recovering circle,
299
341
  #content #graph-content .node.recovering circle
300
342
  {
343
+ color: #d5dd00;
301
344
  stroke: #d5dd00;
302
345
  }
303
346
 
@@ -306,8 +349,11 @@
306
349
  fill: #d5dd00;
307
350
  }
308
351
 
352
+ #content #cloud #legend .active,
353
+ #content #cloud #legend .active circle,
309
354
  #content #graph-content .node.active circle
310
355
  {
356
+ color: #57A957;
311
357
  stroke: #57A957;
312
358
  }
313
359
 
@@ -316,11 +362,17 @@
316
362
  fill: #57A957;
317
363
  }
318
364
 
365
+ #content #cloud #legend .leader circle,
319
366
  #content #graph-content .node.leader circle
320
367
  {
321
368
  fill: #000;
322
369
  }
323
370
 
371
+ #content #cloud #legend .leader circle
372
+ {
373
+ stroke: #fff;
374
+ }
375
+
324
376
  #content #graph-content .link.lvl-2,
325
377
  #content #graph-content .link.leader
326
378
  {
@@ -172,7 +172,7 @@ ul
172
172
  #header
173
173
  {
174
174
  padding-bottom: 10px;
175
- position: absolute;
175
+ position: fixed;
176
176
  z-index: 42;
177
177
  }
178
178
 
@@ -340,12 +340,6 @@ ul
340
340
  width: 100%;
341
341
  }
342
342
 
343
- #content > pre
344
- {
345
- max-height: 600px;
346
- overflow: auto;
347
- }
348
-
349
343
  #content .block
350
344
  {
351
345
  margin-bottom: 10px;
@@ -98,11 +98,6 @@
98
98
  padding-bottom: 3px;
99
99
  }
100
100
 
101
- #content #index .data li.odd
102
- {
103
- color: #c0c0c0;
104
- }
105
-
106
101
  #content #index .data li dt
107
102
  {
108
103
  float: left;
@@ -1,13 +1,13 @@
1
1
  #menu-wrapper
2
2
  {
3
- position: absolute;
4
- top: 90px;
3
+ position: fixed;
4
+ top: 120px;
5
5
  width: 150px;
6
6
  }
7
7
 
8
8
  .has-environment #menu-wrapper
9
9
  {
10
- top: 130px;
10
+ top: 160px;
11
11
  }
12
12
 
13
13
  #menu-wrapper a
@@ -18,6 +18,23 @@
18
18
  text-overflow: ellipsis;
19
19
  }
20
20
 
21
+ #core-selector
22
+ {
23
+ margin-top: 20px;
24
+ padding-right: 10px;
25
+ }
26
+
27
+ #core-selector a
28
+ {
29
+ padding: 0;
30
+ padding-left: 8px;
31
+ }
32
+
33
+ #core-selector select
34
+ {
35
+ width: 100%;
36
+ }
37
+
21
38
  #menu-wrapper .active p
22
39
  {
23
40
  background-color: #fafafa;
@@ -121,32 +138,27 @@
121
138
  display: none;
122
139
  }
123
140
 
124
- #menu-selector
125
- {
126
- margin-top: 20px;
127
- }
128
-
129
- #menu-selector p
141
+ #core-menu p
130
142
  {
131
143
  border-top: 1px solid #f0f0f0;
132
144
  }
133
145
 
134
- #menu-selector li:first-child p
146
+ #core-menu li:first-child p
135
147
  {
136
148
  border-top: 0;
137
149
  }
138
150
 
139
- #menu-selector p a
151
+ #core-menu p a
140
152
  {
141
153
  background-image: url( ../../img/ico/status-offline.png );
142
154
  }
143
155
 
144
- #menu-selector .active p a
156
+ #core-menu .active p a
145
157
  {
146
158
  background-image: url( ../../img/ico/box.png );
147
159
  }
148
160
 
149
- #menu-selector ul,
161
+ #core-menu ul,
150
162
  #menu ul
151
163
  {
152
164
  display: none;
@@ -154,7 +166,7 @@
154
166
  padding-bottom: 10px;
155
167
  }
156
168
 
157
- #menu-selector .active ul,
169
+ #core-menu .active ul,
158
170
  #menu .active ul
159
171
  {
160
172
  display: block;
@@ -165,7 +177,7 @@
165
177
  border-bottom: 0;
166
178
  }
167
179
 
168
- #menu-selector ul li a,
180
+ #core-menu ul li a,
169
181
  #menu ul li a
170
182
  {
171
183
  background-position: 7px 50%;
@@ -175,20 +187,20 @@
175
187
  padding-left: 26px;
176
188
  }
177
189
 
178
- #menu-selector ul li:last-child a,
190
+ #core-menu ul li:last-child a,
179
191
  #menu ul li:last-child a
180
192
  {
181
193
  border-bottom: 0;
182
194
  }
183
195
 
184
- #menu-selector ul li a:hover,
196
+ #core-menu ul li a:hover,
185
197
  #menu ul li a:hover
186
198
  {
187
199
  background-color: #f0f0f0;
188
200
  color: #333;
189
201
  }
190
202
 
191
- #menu-selector ul li.active a,
203
+ #core-menu ul li.active a,
192
204
  #menu ul li.active a
193
205
  {
194
206
  background-color: #d0d0d0;
@@ -213,7 +225,7 @@
213
225
  #menu #cloud.global .rgraph a { background-image: url( ../../img/ico/asterisk.png ); }
214
226
  #menu #cloud.global .dump a { background-image: url( ../../img/ico/download-cloud.png ); }
215
227
 
216
- #menu-selector .ping.error a
228
+ #core-menu .ping.error a
217
229
  {
218
230
 
219
231
  background-color: #ffcccc;
@@ -222,17 +234,18 @@
222
234
  cursor: help;
223
235
  }
224
236
 
225
- #menu-selector .query a { background-image: url( ../../img/ico/magnifier.png ); }
226
- #menu-selector .schema a { background-image: url( ../../img/ico/table.png ); }
227
- #menu-selector .config a { background-image: url( ../../img/ico/gear.png ); }
228
- #menu-selector .analysis a { background-image: url( ../../img/ico/funnel.png ); }
229
- #menu-selector .schema-browser a { background-image: url( ../../img/ico/book-open-text.png ); }
230
- #menu-selector .replication a { background-image: url( ../../img/ico/node.png ); }
231
- #menu-selector .distribution a { background-image: url( ../../img/ico/node-select.png ); }
232
- #menu-selector .ping a { background-image: url( ../../img/ico/system-monitor.png ); }
233
- #menu-selector .logging a { background-image: url( ../../img/ico/inbox-document-text.png ); }
234
- #menu-selector .plugins a { background-image: url( ../../img/ico/block.png ); }
235
- #menu-selector .dataimport a { background-image: url( ../../img/ico/document-import.png ); }
237
+ #core-menu .overview a { background-image: url( ../../img/ico/home.png ); }
238
+ #core-menu .query a { background-image: url( ../../img/ico/magnifier.png ); }
239
+ #core-menu .schema a { background-image: url( ../../img/ico/table.png ); }
240
+ #core-menu .config a { background-image: url( ../../img/ico/gear.png ); }
241
+ #core-menu .analysis a { background-image: url( ../../img/ico/funnel.png ); }
242
+ #core-menu .schema-browser a { background-image: url( ../../img/ico/book-open-text.png ); }
243
+ #core-menu .replication a { background-image: url( ../../img/ico/node.png ); }
244
+ #core-menu .distribution a { background-image: url( ../../img/ico/node-select.png ); }
245
+ #core-menu .ping a { background-image: url( ../../img/ico/system-monitor.png ); }
246
+ #core-menu .logging a { background-image: url( ../../img/ico/inbox-document-text.png ); }
247
+ #core-menu .plugins a { background-image: url( ../../img/ico/block.png ); }
248
+ #core-menu .dataimport a { background-image: url( ../../img/ico/document-import.png ); }
236
249
 
237
250
 
238
251
  #content #navigation