rjack-solr 4.2.1.1-java → 4.3.1.0-java
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 +7 -0
- data/History.rdoc +4 -0
- data/Manifest.txt +3 -2
- data/README.rdoc +1 -1
- data/init/rjack-solr +1 -1
- data/lib/rjack-solr/base.rb +2 -2
- data/lib/rjack-solr/noggit-0.5.jar +0 -0
- data/lib/rjack-solr/{solr-core-4.2.1.jar → solr-core-4.3.1.jar} +0 -0
- data/lib/rjack-solr/{solr-solrj-4.2.1.jar → solr-solrj-4.3.1.jar} +0 -0
- data/pom.xml +2 -2
- data/webapp/META-INF/MANIFEST.MF +4 -3
- data/webapp/WEB-INF/web.xml +3 -3
- data/webapp/admin.html +21 -20
- data/webapp/css/styles/logging.css +15 -2
- data/webapp/css/styles/replication.css +2 -0
- data/webapp/js/scripts/dashboard.js +23 -12
- data/webapp/js/scripts/logging.js +9 -6
- data/webapp/js/scripts/replication.js +25 -12
- data/webapp/tpl/dashboard.html +11 -2
- data/webapp/tpl/replication.html +12 -3
- metadata +30 -56
checksums.yaml
ADDED
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
---
|
|
2
|
+
SHA1:
|
|
3
|
+
metadata.gz: 8adbc2927fd2e5813b29caa369186b9e9817baed
|
|
4
|
+
data.tar.gz: fad3ae1f8afeea475bc16b967b1969056de5fd2e
|
|
5
|
+
SHA512:
|
|
6
|
+
metadata.gz: 9b7cd44bd6e3ebe7d56afde99cfd91506eaa8fcd613e4269325dcfee539cf019e29a28aa738f756993adb8bdf3381441074b03e0ee5d9473a6e5f9343cbebe78
|
|
7
|
+
data.tar.gz: 16a88e7aacde0607dd0a9d9b7cb040e88228bc5734b5df98715ac84c6dc0725ee2c54214074a393712047ec7d16fd9fc942b3a49e1b2810199cab8d8dfd657bf
|
data/History.rdoc
CHANGED
data/Manifest.txt
CHANGED
|
@@ -305,7 +305,8 @@ lib/rjack-solr/commons-cli-1.2.jar
|
|
|
305
305
|
lib/rjack-solr/commons-fileupload-1.2.1.jar
|
|
306
306
|
lib/rjack-solr/commons-io-2.1.jar
|
|
307
307
|
lib/rjack-solr/commons-lang-2.6.jar
|
|
308
|
+
lib/rjack-solr/noggit-0.5.jar
|
|
308
309
|
lib/rjack-solr/org.restlet-2.1.1.jar
|
|
309
310
|
lib/rjack-solr/org.restlet.ext.servlet-2.1.1.jar
|
|
310
|
-
lib/rjack-solr/solr-core-4.
|
|
311
|
-
lib/rjack-solr/solr-solrj-4.
|
|
311
|
+
lib/rjack-solr/solr-core-4.3.1.jar
|
|
312
|
+
lib/rjack-solr/solr-solrj-4.3.1.jar
|
data/README.rdoc
CHANGED
|
@@ -16,7 +16,7 @@ release's sample config:
|
|
|
16
16
|
|
|
17
17
|
% mkdir -p /var/local/rjack-solr
|
|
18
18
|
% cd /var/local/rjack-solr
|
|
19
|
-
% svn checkout http://svn.apache.org/repos/asf/lucene/dev/tags/
|
|
19
|
+
% svn checkout http://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_4_3_1/solr/example/solr/collection1
|
|
20
20
|
|
|
21
21
|
# Edit collection1/conf/schema.xml and remove/comment out the text_ja fieldType
|
|
22
22
|
# The Kuromoji Japanese Morphological is not included in
|
data/init/rjack-solr
CHANGED
data/lib/rjack-solr/base.rb
CHANGED
|
@@ -18,10 +18,10 @@ module RJack
|
|
|
18
18
|
module Solr
|
|
19
19
|
|
|
20
20
|
# SOLR (java) version
|
|
21
|
-
CORE_VERSION = '4.
|
|
21
|
+
CORE_VERSION = '4.3.1'
|
|
22
22
|
|
|
23
23
|
# rjack gem version
|
|
24
|
-
VERSION = CORE_VERSION + '.
|
|
24
|
+
VERSION = CORE_VERSION + '.0'
|
|
25
25
|
|
|
26
26
|
LIB_DIR = File.dirname( __FILE__ ) # :nodoc:
|
|
27
27
|
end
|
|
Binary file
|
|
Binary file
|
|
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.
|
|
18
|
+
<version>4.3.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.
|
|
54
|
+
<version>4.3.1</version>
|
|
55
55
|
<type>war</type>
|
|
56
56
|
</dependency>
|
|
57
57
|
</dependencies>
|
data/webapp/META-INF/MANIFEST.MF
CHANGED
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
Manifest-Version: 1.0
|
|
2
2
|
Ant-Version: Apache Ant 1.8.2
|
|
3
|
-
Created-By: 1.6.
|
|
3
|
+
Created-By: 1.6.0_45-b06-451-11M4406 (Apple Inc.)
|
|
4
4
|
Extension-Name: org.apache.solr
|
|
5
5
|
Specification-Title: Apache Solr Search Server
|
|
6
|
-
Specification-Version: 4.
|
|
6
|
+
Specification-Version: 4.3.1
|
|
7
7
|
Specification-Vendor: The Apache Software Foundation
|
|
8
8
|
Implementation-Title: org.apache.solr
|
|
9
|
-
Implementation-Version: 4.
|
|
9
|
+
Implementation-Version: 4.3.1 1491148 - shalinmangar - 2013-06-09 12:1
|
|
10
|
+
8:42
|
|
10
11
|
Implementation-Vendor: The Apache Software Foundation
|
|
11
12
|
X-Compile-Source-JDK: 1.6
|
|
12
13
|
X-Compile-Target-JDK: 1.6
|
data/webapp/WEB-INF/web.xml
CHANGED
|
@@ -127,11 +127,11 @@
|
|
|
127
127
|
</servlet>
|
|
128
128
|
|
|
129
129
|
<servlet>
|
|
130
|
-
<servlet-name>
|
|
130
|
+
<servlet-name>SolrRestApi</servlet-name>
|
|
131
131
|
<servlet-class>org.restlet.ext.servlet.ServerServlet</servlet-class>
|
|
132
132
|
<init-param>
|
|
133
133
|
<param-name>org.restlet.application</param-name>
|
|
134
|
-
<param-value>org.apache.solr.rest.
|
|
134
|
+
<param-value>org.apache.solr.rest.SolrRestApi</param-value>
|
|
135
135
|
</init-param>
|
|
136
136
|
</servlet>
|
|
137
137
|
|
|
@@ -164,7 +164,7 @@
|
|
|
164
164
|
</servlet-mapping>
|
|
165
165
|
|
|
166
166
|
<servlet-mapping>
|
|
167
|
-
<servlet-name>
|
|
167
|
+
<servlet-name>SolrRestApi</servlet-name>
|
|
168
168
|
<url-pattern>/schema/*</url-pattern>
|
|
169
169
|
</servlet-mapping>
|
|
170
170
|
|
data/webapp/admin.html
CHANGED
|
@@ -22,24 +22,24 @@ limitations under the License.
|
|
|
22
22
|
|
|
23
23
|
<title>Solr Admin</title>
|
|
24
24
|
|
|
25
|
-
<link rel="icon" type="image/ico" href="img/favicon.ico">
|
|
26
|
-
|
|
27
|
-
<link rel="stylesheet" type="text/css" href="css/styles/common.css">
|
|
28
|
-
<link rel="stylesheet" type="text/css" href="css/styles/analysis.css">
|
|
29
|
-
<link rel="stylesheet" type="text/css" href="css/styles/cloud.css">
|
|
30
|
-
<link rel="stylesheet" type="text/css" href="css/styles/cores.css">
|
|
31
|
-
<link rel="stylesheet" type="text/css" href="css/styles/dashboard.css">
|
|
32
|
-
<link rel="stylesheet" type="text/css" href="css/styles/dataimport.css">
|
|
33
|
-
<link rel="stylesheet" type="text/css" href="css/styles/index.css">
|
|
34
|
-
<link rel="stylesheet" type="text/css" href="css/styles/java-properties.css">
|
|
35
|
-
<link rel="stylesheet" type="text/css" href="css/styles/logging.css">
|
|
36
|
-
<link rel="stylesheet" type="text/css" href="css/styles/menu.css">
|
|
37
|
-
<link rel="stylesheet" type="text/css" href="css/styles/plugins.css">
|
|
38
|
-
<link rel="stylesheet" type="text/css" href="css/styles/query.css">
|
|
39
|
-
<link rel="stylesheet" type="text/css" href="css/styles/replication.css">
|
|
40
|
-
<link rel="stylesheet" type="text/css" href="css/styles/schema-browser.css">
|
|
41
|
-
<link rel="stylesheet" type="text/css" href="css/styles/threads.css">
|
|
42
|
-
<link rel="stylesheet" type="text/css" href="css/chosen.css">
|
|
25
|
+
<link rel="icon" type="image/ico" href="img/favicon.ico?_=${version}">
|
|
26
|
+
|
|
27
|
+
<link rel="stylesheet" type="text/css" href="css/styles/common.css?_=${version}">
|
|
28
|
+
<link rel="stylesheet" type="text/css" href="css/styles/analysis.css?_=${version}">
|
|
29
|
+
<link rel="stylesheet" type="text/css" href="css/styles/cloud.css?_=${version}">
|
|
30
|
+
<link rel="stylesheet" type="text/css" href="css/styles/cores.css?_=${version}">
|
|
31
|
+
<link rel="stylesheet" type="text/css" href="css/styles/dashboard.css?_=${version}">
|
|
32
|
+
<link rel="stylesheet" type="text/css" href="css/styles/dataimport.css?_=${version}">
|
|
33
|
+
<link rel="stylesheet" type="text/css" href="css/styles/index.css?_=${version}">
|
|
34
|
+
<link rel="stylesheet" type="text/css" href="css/styles/java-properties.css?_=${version}">
|
|
35
|
+
<link rel="stylesheet" type="text/css" href="css/styles/logging.css?_=${version}">
|
|
36
|
+
<link rel="stylesheet" type="text/css" href="css/styles/menu.css?_=${version}">
|
|
37
|
+
<link rel="stylesheet" type="text/css" href="css/styles/plugins.css?_=${version}">
|
|
38
|
+
<link rel="stylesheet" type="text/css" href="css/styles/query.css?_=${version}">
|
|
39
|
+
<link rel="stylesheet" type="text/css" href="css/styles/replication.css?_=${version}">
|
|
40
|
+
<link rel="stylesheet" type="text/css" href="css/styles/schema-browser.css?_=${version}">
|
|
41
|
+
<link rel="stylesheet" type="text/css" href="css/styles/threads.css?_=${version}">
|
|
42
|
+
<link rel="stylesheet" type="text/css" href="css/chosen.css?_=${version}">
|
|
43
43
|
|
|
44
44
|
<script type="text/javascript">
|
|
45
45
|
|
|
@@ -138,8 +138,9 @@ limitations under the License.
|
|
|
138
138
|
</div>
|
|
139
139
|
|
|
140
140
|
</div>
|
|
141
|
-
|
|
142
|
-
<script
|
|
141
|
+
|
|
142
|
+
<script type="text/javascript"> var require = { urlArgs: '_=${version}' }; </script>
|
|
143
|
+
<script src="js/require.js?_=${version}" data-main="js/main"></script>
|
|
143
144
|
|
|
144
145
|
</body>
|
|
145
146
|
</html>
|
|
@@ -84,8 +84,13 @@
|
|
|
84
84
|
}
|
|
85
85
|
|
|
86
86
|
#content #logging #viewer tbody .level-info .level span { background-color: #ebf5eb; }
|
|
87
|
-
#content #logging #viewer tbody .level-warning
|
|
88
|
-
#content #logging #viewer tbody .level-severe
|
|
87
|
+
#content #logging #viewer tbody .level-warning span { background-color: #FFD930; }
|
|
88
|
+
#content #logging #viewer tbody .level-severe span { background-color: #c43c35; color: #fff; }
|
|
89
|
+
|
|
90
|
+
#content #logging #viewer tbody .level-debug span { background-color: #ebf5eb; }
|
|
91
|
+
#content #logging #viewer tbody .level-warn span { background-color: #FFD930; }
|
|
92
|
+
#content #logging #viewer tbody .level-error span { background-color: #FF6130; }
|
|
93
|
+
#content #logging #viewer tbody .level-fatal span { background-color: #c43c35; }
|
|
89
94
|
|
|
90
95
|
#content #logging #viewer tbody .has-trace a
|
|
91
96
|
{
|
|
@@ -188,6 +193,13 @@
|
|
|
188
193
|
padding-right: 21px;
|
|
189
194
|
}
|
|
190
195
|
|
|
196
|
+
#content #logging .jstree a span.name em
|
|
197
|
+
{
|
|
198
|
+
color: #f00;
|
|
199
|
+
font-style: normal;
|
|
200
|
+
text-transform: uppercase;
|
|
201
|
+
}
|
|
202
|
+
|
|
191
203
|
#content #logging .jstree a.trigger.set
|
|
192
204
|
{
|
|
193
205
|
font-weight: bold;
|
|
@@ -219,6 +231,7 @@
|
|
|
219
231
|
#content #logging .jstree li li li li li .selector-holder { left: 368px; }
|
|
220
232
|
#content #logging .jstree li li li li li li .selector-holder { left: 350px; }
|
|
221
233
|
#content #logging .jstree li li li li li li li .selector-holder { left: 332px; }
|
|
234
|
+
#content #logging .jstree li li li li li li li li .selector-holder { left: 314px; }
|
|
222
235
|
|
|
223
236
|
#content #logging .jstree .selector
|
|
224
237
|
{
|
|
@@ -283,6 +283,7 @@
|
|
|
283
283
|
|
|
284
284
|
#content #replication #details table
|
|
285
285
|
{
|
|
286
|
+
margin-left: 20px;
|
|
286
287
|
border-collapse: collapse;
|
|
287
288
|
}
|
|
288
289
|
|
|
@@ -339,6 +340,7 @@
|
|
|
339
340
|
{
|
|
340
341
|
padding-right: 10px;
|
|
341
342
|
text-align: right;
|
|
343
|
+
white-space: nowrap;
|
|
342
344
|
}
|
|
343
345
|
|
|
344
346
|
#content #replication #details table tbody .size
|
|
@@ -48,27 +48,26 @@ sammy.get
|
|
|
48
48
|
content_element
|
|
49
49
|
.removeClass( 'single' );
|
|
50
50
|
|
|
51
|
-
|
|
52
|
-
if( !core_menu.data( 'admin-extra-loaded' ) )
|
|
51
|
+
if( !app.core_menu.data( 'admin-extra-loaded' ) )
|
|
53
52
|
{
|
|
54
|
-
core_menu.data( 'admin-extra-loaded', new Date() );
|
|
53
|
+
app.core_menu.data( 'admin-extra-loaded', new Date() );
|
|
55
54
|
|
|
56
55
|
$.get
|
|
57
56
|
(
|
|
58
|
-
core_basepath + '/admin/file/?file=admin-extra.menu-top.html',
|
|
57
|
+
core_basepath + '/admin/file/?file=admin-extra.menu-top.html&contentType=text/html;charset=utf-8',
|
|
59
58
|
function( menu_extra )
|
|
60
59
|
{
|
|
61
|
-
core_menu
|
|
60
|
+
app.core_menu
|
|
62
61
|
.prepend( menu_extra );
|
|
63
62
|
}
|
|
64
63
|
);
|
|
65
|
-
|
|
64
|
+
|
|
66
65
|
$.get
|
|
67
66
|
(
|
|
68
|
-
core_basepath + '/admin/file/?file=admin-extra.menu-bottom.html',
|
|
67
|
+
core_basepath + '/admin/file/?file=admin-extra.menu-bottom.html&contentType=text/html;charset=utf-8',
|
|
69
68
|
function( menu_extra )
|
|
70
69
|
{
|
|
71
|
-
core_menu
|
|
70
|
+
app.core_menu
|
|
72
71
|
.append( menu_extra );
|
|
73
72
|
}
|
|
74
73
|
);
|
|
@@ -257,7 +256,8 @@ sammy.get
|
|
|
257
256
|
var is_slave = 'undefined' !== typeof( data.slave );
|
|
258
257
|
var headline = $( 'h2 span', this );
|
|
259
258
|
var details_element = $( '#details', this );
|
|
260
|
-
var current_type_element = $( ( is_slave ? '.slave' : '.
|
|
259
|
+
var current_type_element = $( ( is_slave ? '.slave' : '.masterSearch' ), this );
|
|
260
|
+
var master_data = is_slave ? data.slave.masterDetails : data;
|
|
261
261
|
|
|
262
262
|
if( is_slave )
|
|
263
263
|
{
|
|
@@ -276,6 +276,7 @@ sammy.get
|
|
|
276
276
|
.html( headline.html() + ' (Master)' );
|
|
277
277
|
}
|
|
278
278
|
|
|
279
|
+
// the currently searchable commit regardless of type
|
|
279
280
|
$( '.version div', current_type_element )
|
|
280
281
|
.html( data.indexVersion );
|
|
281
282
|
$( '.generation div', current_type_element )
|
|
@@ -283,9 +284,18 @@ sammy.get
|
|
|
283
284
|
$( '.size div', current_type_element )
|
|
284
285
|
.html( data.indexSize );
|
|
285
286
|
|
|
287
|
+
// what's replicable on the master
|
|
288
|
+
var master_element = $( '.master', details_element );
|
|
289
|
+
$( '.version div', master_element )
|
|
290
|
+
.html( master_data.master.replicableVersion || '-' );
|
|
291
|
+
$( '.generation div', master_element )
|
|
292
|
+
.html( master_data.master.replicableGeneration || '-' );
|
|
293
|
+
$( '.size div', master_element )
|
|
294
|
+
.html( "-" );
|
|
295
|
+
|
|
286
296
|
if( is_slave )
|
|
287
297
|
{
|
|
288
|
-
var master_element = $( '.
|
|
298
|
+
var master_element = $( '.masterSearch', details_element );
|
|
289
299
|
$( '.version div', master_element )
|
|
290
300
|
.html( data.slave.masterDetails.indexVersion );
|
|
291
301
|
$( '.generation div', master_element )
|
|
@@ -293,7 +303,8 @@ sammy.get
|
|
|
293
303
|
$( '.size div', master_element )
|
|
294
304
|
.html( data.slave.masterDetails.indexSize );
|
|
295
305
|
|
|
296
|
-
|
|
306
|
+
// warnings if slave version|gen doesn't match what's replicable
|
|
307
|
+
if( data.indexVersion !== master_data.master.replicableVersion )
|
|
297
308
|
{
|
|
298
309
|
$( '.version', details_element )
|
|
299
310
|
.addClass( 'diff' );
|
|
@@ -304,7 +315,7 @@ sammy.get
|
|
|
304
315
|
.removeClass( 'diff' );
|
|
305
316
|
}
|
|
306
317
|
|
|
307
|
-
if( data.generation !==
|
|
318
|
+
if( data.generation !== master_data.master.replicableGeneration )
|
|
308
319
|
{
|
|
309
320
|
$( '.generation', details_element )
|
|
310
321
|
.addClass( 'diff' );
|
|
@@ -99,17 +99,20 @@ var logging_handler = function( response, text_status, xhr )
|
|
|
99
99
|
logger_content += '<span class="ns">' + logger_name.join( '.' ).esc() + '.</span>';
|
|
100
100
|
}
|
|
101
101
|
|
|
102
|
-
logger_content += '<span class="name">' + display_name.esc() + '</span>' + "\n";
|
|
102
|
+
logger_content += '<span class="name">' + ( display_name ? display_name.esc() : '<em>empty</em>' ) + '</span>' + "\n";
|
|
103
103
|
logger_content += '</a>';
|
|
104
104
|
|
|
105
105
|
logger_content += levels;
|
|
106
106
|
|
|
107
|
-
|
|
108
|
-
if( child_logger_content )
|
|
107
|
+
if( !!logger.name )
|
|
109
108
|
{
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
109
|
+
var child_logger_content = logger_tree( logger.name );
|
|
110
|
+
if( child_logger_content )
|
|
111
|
+
{
|
|
112
|
+
logger_content += '<ul>';
|
|
113
|
+
logger_content += child_logger_content;
|
|
114
|
+
logger_content += '</ul>';
|
|
115
|
+
}
|
|
113
116
|
}
|
|
114
117
|
|
|
115
118
|
logger_content += '</li>';
|
|
@@ -246,26 +246,39 @@ var replication_fetch_status = function()
|
|
|
246
246
|
}
|
|
247
247
|
|
|
248
248
|
var details_element = $( '#details', replication_element );
|
|
249
|
-
var current_type_element = $( ( is_slave ? '.slave' : '.
|
|
249
|
+
var current_type_element = $( ( is_slave ? '.slave' : '.masterSearch' ), details_element );
|
|
250
|
+
var master_data = is_slave ? data.slave.masterDetails : data;
|
|
250
251
|
|
|
252
|
+
// the currently searchable commit regardless of type
|
|
251
253
|
$( '.version div', current_type_element )
|
|
252
254
|
.html( data.indexVersion );
|
|
253
255
|
$( '.generation div', current_type_element )
|
|
254
256
|
.html( data.generation );
|
|
255
257
|
$( '.size div', current_type_element )
|
|
256
258
|
.html( data.indexSize );
|
|
259
|
+
|
|
260
|
+
// what's replicable on the master
|
|
261
|
+
var master_element = $( '.master', details_element );
|
|
262
|
+
$( '.version div', master_element )
|
|
263
|
+
.html( master_data.master.replicableVersion || '-' );
|
|
264
|
+
$( '.generation div', master_element )
|
|
265
|
+
.html( master_data.master.replicableGeneration || '-' );
|
|
266
|
+
$( '.size div', master_element )
|
|
267
|
+
.html( "-" );
|
|
257
268
|
|
|
258
269
|
if( is_slave )
|
|
259
270
|
{
|
|
260
|
-
|
|
261
|
-
$( '.
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
271
|
+
// what's searchable on the master
|
|
272
|
+
var master_searchable = $( '.masterSearch', details_element );
|
|
273
|
+
$( '.version div', master_searchable )
|
|
274
|
+
.html( master_data.indexVersion );
|
|
275
|
+
$( '.generation div', master_searchable )
|
|
276
|
+
.html( master_data.generation );
|
|
277
|
+
$( '.size div', master_searchable )
|
|
278
|
+
.html( master_data.indexSize );
|
|
279
|
+
|
|
280
|
+
// warnings if slave version|gen doesn't match what's replicable
|
|
281
|
+
if( data.indexVersion !== master_data.master.replicableVersion )
|
|
269
282
|
{
|
|
270
283
|
$( '.version', details_element )
|
|
271
284
|
.addClass( 'diff' );
|
|
@@ -276,7 +289,7 @@ var replication_fetch_status = function()
|
|
|
276
289
|
.removeClass( 'diff' );
|
|
277
290
|
}
|
|
278
291
|
|
|
279
|
-
if( data.generation !==
|
|
292
|
+
if( data.generation !== master_data.master.replicableGeneration )
|
|
280
293
|
{
|
|
281
294
|
$( '.generation', details_element )
|
|
282
295
|
.addClass( 'diff' );
|
|
@@ -511,4 +524,4 @@ sammy.get
|
|
|
511
524
|
}
|
|
512
525
|
);
|
|
513
526
|
}
|
|
514
|
-
);
|
|
527
|
+
);
|
data/webapp/tpl/dashboard.html
CHANGED
|
@@ -103,9 +103,18 @@ limitations under the License.
|
|
|
103
103
|
</thead>
|
|
104
104
|
<tbody>
|
|
105
105
|
|
|
106
|
+
<tr class="masterSearch">
|
|
107
|
+
|
|
108
|
+
<th>Master (Searching)</th>
|
|
109
|
+
<td class="version"><div>x</div></td>
|
|
110
|
+
<td class="generation"><div>y</div></td>
|
|
111
|
+
<td class="size"><div>z</div></td>
|
|
112
|
+
|
|
113
|
+
</tr>
|
|
114
|
+
|
|
106
115
|
<tr class="master">
|
|
107
116
|
|
|
108
|
-
<th>Master
|
|
117
|
+
<th>Master (Replicable)</th>
|
|
109
118
|
<td class="version"><div>x</div></td>
|
|
110
119
|
<td class="generation"><div>y</div></td>
|
|
111
120
|
<td class="size"><div>z</div></td>
|
|
@@ -114,7 +123,7 @@ limitations under the License.
|
|
|
114
123
|
|
|
115
124
|
<tr class="slave slaveOnly">
|
|
116
125
|
|
|
117
|
-
<th>Slave
|
|
126
|
+
<th>Slave (Searching)</th>
|
|
118
127
|
<td class="version"><div>a</div></td>
|
|
119
128
|
<td class="generation"><div>c</div></td>
|
|
120
129
|
<td class="size"><div>c</div></td>
|
data/webapp/tpl/replication.html
CHANGED
|
@@ -116,9 +116,18 @@ limitations under the License.
|
|
|
116
116
|
</thead>
|
|
117
117
|
<tbody>
|
|
118
118
|
|
|
119
|
+
<tr class="masterSearch">
|
|
120
|
+
|
|
121
|
+
<th>Master (Searching)</th>
|
|
122
|
+
<td class="version"><div></div></td>
|
|
123
|
+
<td class="generation"><div></div></td>
|
|
124
|
+
<td class="size"><div></div></td>
|
|
125
|
+
|
|
126
|
+
</tr>
|
|
127
|
+
|
|
119
128
|
<tr class="master">
|
|
120
129
|
|
|
121
|
-
<th>Master
|
|
130
|
+
<th>Master (Replicable)</th>
|
|
122
131
|
<td class="version"><div></div></td>
|
|
123
132
|
<td class="generation"><div></div></td>
|
|
124
133
|
<td class="size"><div></div></td>
|
|
@@ -127,7 +136,7 @@ limitations under the License.
|
|
|
127
136
|
|
|
128
137
|
<tr class="slave slaveOnly">
|
|
129
138
|
|
|
130
|
-
<th>Slave
|
|
139
|
+
<th>Slave (Searching)</th>
|
|
131
140
|
<td class="version"><div></div></td>
|
|
132
141
|
<td class="generation"><div></div></td>
|
|
133
142
|
<td class="size"><div></div></td>
|
|
@@ -204,4 +213,4 @@ limitations under the License.
|
|
|
204
213
|
|
|
205
214
|
</div>
|
|
206
215
|
|
|
207
|
-
</div>
|
|
216
|
+
</div>
|
metadata
CHANGED
|
@@ -1,36 +1,33 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: rjack-solr
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
|
|
5
|
-
version: 4.2.1.1
|
|
4
|
+
version: 4.3.1.0
|
|
6
5
|
platform: java
|
|
7
6
|
authors:
|
|
8
7
|
- David Kellum
|
|
9
8
|
autorequire:
|
|
10
9
|
bindir: bin
|
|
11
10
|
cert_chain: []
|
|
12
|
-
date: 2013-
|
|
11
|
+
date: 2013-10-11 00:00:00.000000000 Z
|
|
13
12
|
dependencies:
|
|
14
13
|
- !ruby/object:Gem::Dependency
|
|
15
14
|
name: rjack-commons-codec
|
|
16
15
|
version_requirements: !ruby/object:Gem::Requirement
|
|
17
16
|
requirements:
|
|
18
|
-
- -
|
|
17
|
+
- - '>='
|
|
19
18
|
- !ruby/object:Gem::Version
|
|
20
19
|
version: 1.7.0
|
|
21
20
|
- - <
|
|
22
21
|
- !ruby/object:Gem::Version
|
|
23
22
|
version: '1.9'
|
|
24
|
-
none: false
|
|
25
23
|
requirement: !ruby/object:Gem::Requirement
|
|
26
24
|
requirements:
|
|
27
|
-
- -
|
|
25
|
+
- - '>='
|
|
28
26
|
- !ruby/object:Gem::Version
|
|
29
27
|
version: 1.7.0
|
|
30
28
|
- - <
|
|
31
29
|
- !ruby/object:Gem::Version
|
|
32
30
|
version: '1.9'
|
|
33
|
-
none: false
|
|
34
31
|
prerelease: false
|
|
35
32
|
type: :runtime
|
|
36
33
|
- !ruby/object:Gem::Dependency
|
|
@@ -39,74 +36,72 @@ dependencies:
|
|
|
39
36
|
requirements:
|
|
40
37
|
- - ~>
|
|
41
38
|
- !ruby/object:Gem::Version
|
|
42
|
-
version: 4.
|
|
43
|
-
none: false
|
|
39
|
+
version: 4.3.1
|
|
44
40
|
requirement: !ruby/object:Gem::Requirement
|
|
45
41
|
requirements:
|
|
46
42
|
- - ~>
|
|
47
43
|
- !ruby/object:Gem::Version
|
|
48
|
-
version: 4.
|
|
49
|
-
none: false
|
|
44
|
+
version: 4.3.1
|
|
50
45
|
prerelease: false
|
|
51
46
|
type: :runtime
|
|
52
47
|
- !ruby/object:Gem::Dependency
|
|
53
48
|
name: rjack-jetty
|
|
54
49
|
version_requirements: !ruby/object:Gem::Requirement
|
|
55
50
|
requirements:
|
|
56
|
-
- -
|
|
51
|
+
- - '>='
|
|
57
52
|
- !ruby/object:Gem::Version
|
|
58
53
|
version: 7.6.9
|
|
59
54
|
- - <
|
|
60
55
|
- !ruby/object:Gem::Version
|
|
61
56
|
version: '9.1'
|
|
62
|
-
none: false
|
|
63
57
|
requirement: !ruby/object:Gem::Requirement
|
|
64
58
|
requirements:
|
|
65
|
-
- -
|
|
59
|
+
- - '>='
|
|
66
60
|
- !ruby/object:Gem::Version
|
|
67
61
|
version: 7.6.9
|
|
68
62
|
- - <
|
|
69
63
|
- !ruby/object:Gem::Version
|
|
70
64
|
version: '9.1'
|
|
71
|
-
none: false
|
|
72
65
|
prerelease: false
|
|
73
66
|
type: :runtime
|
|
74
67
|
- !ruby/object:Gem::Dependency
|
|
75
68
|
name: rjack-jetty-jsp
|
|
76
69
|
version_requirements: !ruby/object:Gem::Requirement
|
|
77
70
|
requirements:
|
|
78
|
-
- -
|
|
71
|
+
- - '>='
|
|
79
72
|
- !ruby/object:Gem::Version
|
|
80
73
|
version: 7.6.7
|
|
81
74
|
- - <
|
|
82
75
|
- !ruby/object:Gem::Version
|
|
83
76
|
version: '9.1'
|
|
84
|
-
none: false
|
|
85
77
|
requirement: !ruby/object:Gem::Requirement
|
|
86
78
|
requirements:
|
|
87
|
-
- -
|
|
79
|
+
- - '>='
|
|
88
80
|
- !ruby/object:Gem::Version
|
|
89
81
|
version: 7.6.7
|
|
90
82
|
- - <
|
|
91
83
|
- !ruby/object:Gem::Version
|
|
92
84
|
version: '9.1'
|
|
93
|
-
none: false
|
|
94
85
|
prerelease: false
|
|
95
86
|
type: :runtime
|
|
96
87
|
- !ruby/object:Gem::Dependency
|
|
97
88
|
name: rjack-httpclient-4
|
|
98
89
|
version_requirements: !ruby/object:Gem::Requirement
|
|
99
90
|
requirements:
|
|
100
|
-
- -
|
|
91
|
+
- - '>='
|
|
101
92
|
- !ruby/object:Gem::Version
|
|
102
93
|
version: 4.2.3
|
|
103
|
-
|
|
94
|
+
- - <
|
|
95
|
+
- !ruby/object:Gem::Version
|
|
96
|
+
version: '4.4'
|
|
104
97
|
requirement: !ruby/object:Gem::Requirement
|
|
105
98
|
requirements:
|
|
106
|
-
- -
|
|
99
|
+
- - '>='
|
|
107
100
|
- !ruby/object:Gem::Version
|
|
108
101
|
version: 4.2.3
|
|
109
|
-
|
|
102
|
+
- - <
|
|
103
|
+
- !ruby/object:Gem::Version
|
|
104
|
+
version: '4.4'
|
|
110
105
|
prerelease: false
|
|
111
106
|
type: :runtime
|
|
112
107
|
- !ruby/object:Gem::Dependency
|
|
@@ -116,13 +111,11 @@ dependencies:
|
|
|
116
111
|
- - ~>
|
|
117
112
|
- !ruby/object:Gem::Version
|
|
118
113
|
version: 3.4.5
|
|
119
|
-
none: false
|
|
120
114
|
requirement: !ruby/object:Gem::Requirement
|
|
121
115
|
requirements:
|
|
122
116
|
- - ~>
|
|
123
117
|
- !ruby/object:Gem::Version
|
|
124
118
|
version: 3.4.5
|
|
125
|
-
none: false
|
|
126
119
|
prerelease: false
|
|
127
120
|
type: :runtime
|
|
128
121
|
- !ruby/object:Gem::Dependency
|
|
@@ -132,13 +125,11 @@ dependencies:
|
|
|
132
125
|
- - ~>
|
|
133
126
|
- !ruby/object:Gem::Version
|
|
134
127
|
version: '13.0'
|
|
135
|
-
none: false
|
|
136
128
|
requirement: !ruby/object:Gem::Requirement
|
|
137
129
|
requirements:
|
|
138
130
|
- - ~>
|
|
139
131
|
- !ruby/object:Gem::Version
|
|
140
132
|
version: '13.0'
|
|
141
|
-
none: false
|
|
142
133
|
prerelease: false
|
|
143
134
|
type: :runtime
|
|
144
135
|
- !ruby/object:Gem::Dependency
|
|
@@ -148,35 +139,31 @@ dependencies:
|
|
|
148
139
|
- - ~>
|
|
149
140
|
- !ruby/object:Gem::Version
|
|
150
141
|
version: 1.0.1
|
|
151
|
-
none: false
|
|
152
142
|
requirement: !ruby/object:Gem::Requirement
|
|
153
143
|
requirements:
|
|
154
144
|
- - ~>
|
|
155
145
|
- !ruby/object:Gem::Version
|
|
156
146
|
version: 1.0.1
|
|
157
|
-
none: false
|
|
158
147
|
prerelease: false
|
|
159
148
|
type: :runtime
|
|
160
149
|
- !ruby/object:Gem::Dependency
|
|
161
150
|
name: rjack-slf4j
|
|
162
151
|
version_requirements: !ruby/object:Gem::Requirement
|
|
163
152
|
requirements:
|
|
164
|
-
- -
|
|
153
|
+
- - '>='
|
|
165
154
|
- !ruby/object:Gem::Version
|
|
166
155
|
version: 1.6.5
|
|
167
156
|
- - <
|
|
168
157
|
- !ruby/object:Gem::Version
|
|
169
158
|
version: '1.8'
|
|
170
|
-
none: false
|
|
171
159
|
requirement: !ruby/object:Gem::Requirement
|
|
172
160
|
requirements:
|
|
173
|
-
- -
|
|
161
|
+
- - '>='
|
|
174
162
|
- !ruby/object:Gem::Version
|
|
175
163
|
version: 1.6.5
|
|
176
164
|
- - <
|
|
177
165
|
- !ruby/object:Gem::Version
|
|
178
166
|
version: '1.8'
|
|
179
|
-
none: false
|
|
180
167
|
prerelease: false
|
|
181
168
|
type: :runtime
|
|
182
169
|
- !ruby/object:Gem::Dependency
|
|
@@ -186,13 +173,11 @@ dependencies:
|
|
|
186
173
|
- - ~>
|
|
187
174
|
- !ruby/object:Gem::Version
|
|
188
175
|
version: '1.2'
|
|
189
|
-
none: false
|
|
190
176
|
requirement: !ruby/object:Gem::Requirement
|
|
191
177
|
requirements:
|
|
192
178
|
- - ~>
|
|
193
179
|
- !ruby/object:Gem::Version
|
|
194
180
|
version: '1.2'
|
|
195
|
-
none: false
|
|
196
181
|
prerelease: false
|
|
197
182
|
type: :runtime
|
|
198
183
|
- !ruby/object:Gem::Dependency
|
|
@@ -201,14 +186,12 @@ dependencies:
|
|
|
201
186
|
requirements:
|
|
202
187
|
- - ~>
|
|
203
188
|
- !ruby/object:Gem::Version
|
|
204
|
-
version:
|
|
205
|
-
none: false
|
|
189
|
+
version: 4.7.4
|
|
206
190
|
requirement: !ruby/object:Gem::Requirement
|
|
207
191
|
requirements:
|
|
208
192
|
- - ~>
|
|
209
193
|
- !ruby/object:Gem::Version
|
|
210
|
-
version:
|
|
211
|
-
none: false
|
|
194
|
+
version: 4.7.4
|
|
212
195
|
prerelease: false
|
|
213
196
|
type: :development
|
|
214
197
|
- !ruby/object:Gem::Dependency
|
|
@@ -218,13 +201,11 @@ dependencies:
|
|
|
218
201
|
- - ~>
|
|
219
202
|
- !ruby/object:Gem::Version
|
|
220
203
|
version: '2.0'
|
|
221
|
-
none: false
|
|
222
204
|
requirement: !ruby/object:Gem::Requirement
|
|
223
205
|
requirements:
|
|
224
206
|
- - ~>
|
|
225
207
|
- !ruby/object:Gem::Version
|
|
226
208
|
version: '2.0'
|
|
227
|
-
none: false
|
|
228
209
|
prerelease: false
|
|
229
210
|
type: :development
|
|
230
211
|
description:
|
|
@@ -530,12 +511,14 @@ files:
|
|
|
530
511
|
- lib/rjack-solr/commons-fileupload-1.2.1.jar
|
|
531
512
|
- lib/rjack-solr/commons-io-2.1.jar
|
|
532
513
|
- lib/rjack-solr/commons-lang-2.6.jar
|
|
514
|
+
- lib/rjack-solr/noggit-0.5.jar
|
|
533
515
|
- lib/rjack-solr/org.restlet-2.1.1.jar
|
|
534
516
|
- lib/rjack-solr/org.restlet.ext.servlet-2.1.1.jar
|
|
535
|
-
- lib/rjack-solr/solr-core-4.
|
|
536
|
-
- lib/rjack-solr/solr-solrj-4.
|
|
517
|
+
- lib/rjack-solr/solr-core-4.3.1.jar
|
|
518
|
+
- lib/rjack-solr/solr-solrj-4.3.1.jar
|
|
537
519
|
homepage: http://rjack.rubyforge.org/solr
|
|
538
520
|
licenses: []
|
|
521
|
+
metadata: {}
|
|
539
522
|
post_install_message:
|
|
540
523
|
rdoc_options:
|
|
541
524
|
- --main
|
|
@@ -544,27 +527,18 @@ require_paths:
|
|
|
544
527
|
- lib
|
|
545
528
|
required_ruby_version: !ruby/object:Gem::Requirement
|
|
546
529
|
requirements:
|
|
547
|
-
- -
|
|
530
|
+
- - '>='
|
|
548
531
|
- !ruby/object:Gem::Version
|
|
549
532
|
version: '0'
|
|
550
|
-
segments:
|
|
551
|
-
- 0
|
|
552
|
-
hash: 2
|
|
553
|
-
none: false
|
|
554
533
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
555
534
|
requirements:
|
|
556
|
-
- -
|
|
535
|
+
- - '>='
|
|
557
536
|
- !ruby/object:Gem::Version
|
|
558
537
|
version: '0'
|
|
559
|
-
segments:
|
|
560
|
-
- 0
|
|
561
|
-
hash: 2
|
|
562
|
-
none: false
|
|
563
538
|
requirements: []
|
|
564
539
|
rubyforge_project:
|
|
565
|
-
rubygems_version: 1.
|
|
540
|
+
rubygems_version: 2.1.5
|
|
566
541
|
signing_key:
|
|
567
|
-
specification_version:
|
|
542
|
+
specification_version: 4
|
|
568
543
|
summary: A gem packaging of Solr.
|
|
569
544
|
test_files: []
|
|
570
|
-
...
|