sunspot_solr 2.2.2 → 2.2.3

data/spec/server_spec.rb

@@ -16,15 +16,10 @@ describe Sunspot::Solr::Server do
     @server.run
   end
 
-  it 'runs Java with min memory' do
-    @server.min_memory = 1024
-    @server.should_receive(:exec).with(/-Xms1024/)
-    @server.run
-  end
-
-  it 'runs Java with max memory' do
-    @server.max_memory = 2048
+  it 'runs Java with memory set' do
+    @server.memory = 2048
     @server.should_receive(:exec).with(/-Xmx2048/)
+    @server.should_receive(:exec).with(/-Xms2048/)
     @server.run
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunspot_solr
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Mat Brown
@@ -26,7 +26,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -92,7 +92,10 @@ files:
 - solr/bin/solr.in.sh
 - solr/server/README.txt
 - solr/server/contexts/solr-jetty-context.xml
+- solr/server/etc/jetty-http.xml
 - solr/server/etc/jetty-https-ssl.xml
+- solr/server/etc/jetty-https.xml
+- solr/server/etc/jetty-ssl.xml
 - solr/server/etc/jetty.xml
 - solr/server/etc/webdefault.xml
 - solr/server/lib/ext/jcl-over-slf4j-1.7.7.jar
@@ -100,20 +103,26 @@ files:
 - solr/server/lib/ext/log4j-1.2.17.jar
 - solr/server/lib/ext/slf4j-api-1.7.7.jar
 - solr/server/lib/ext/slf4j-log4j12-1.7.7.jar
-- solr/server/lib/jetty-continuation-8.1.10.v20130312.jar
-- solr/server/lib/jetty-deploy-8.1.10.v20130312.jar
-- solr/server/lib/jetty-http-8.1.10.v20130312.jar
-- solr/server/lib/jetty-io-8.1.10.v20130312.jar
-- solr/server/lib/jetty-jmx-8.1.10.v20130312.jar
-- solr/server/lib/jetty-security-8.1.10.v20130312.jar
-- solr/server/lib/jetty-server-8.1.10.v20130312.jar
-- solr/server/lib/jetty-servlet-8.1.10.v20130312.jar
-- solr/server/lib/jetty-util-8.1.10.v20130312.jar
-- solr/server/lib/jetty-webapp-8.1.10.v20130312.jar
-- solr/server/lib/jetty-xml-8.1.10.v20130312.jar
-- solr/server/lib/servlet-api-3.0.jar
+- solr/server/lib/javax.servlet-api-3.1.0.jar
+- solr/server/lib/jetty-continuation-9.2.11.v20150529.jar
+- solr/server/lib/jetty-deploy-9.2.11.v20150529.jar
+- solr/server/lib/jetty-http-9.2.11.v20150529.jar
+- solr/server/lib/jetty-io-9.2.11.v20150529.jar
+- solr/server/lib/jetty-jmx-9.2.11.v20150529.jar
+- solr/server/lib/jetty-rewrite-9.2.11.v20150529.jar
+- solr/server/lib/jetty-security-9.2.11.v20150529.jar
+- solr/server/lib/jetty-server-9.2.11.v20150529.jar
+- solr/server/lib/jetty-servlet-9.2.11.v20150529.jar
+- solr/server/lib/jetty-servlets-9.2.11.v20150529.jar
+- solr/server/lib/jetty-util-9.2.11.v20150529.jar
+- solr/server/lib/jetty-webapp-9.2.11.v20150529.jar
+- solr/server/lib/jetty-xml-9.2.11.v20150529.jar
+- solr/server/modules/http.mod
+- solr/server/modules/https.mod
+- solr/server/modules/server.mod
+- solr/server/modules/ssl.mod
+- solr/server/resources/jetty-logging.properties
 - solr/server/resources/log4j.properties
-- solr/server/solr-webapp/webapp/.gitignore
 - solr/server/solr-webapp/webapp/WEB-INF/lib/antlr-runtime-3.5.jar
 - solr/server/solr-webapp/webapp/WEB-INF/lib/asm-4.1.jar
 - solr/server/solr-webapp/webapp/WEB-INF/lib/asm-commons-4.1.jar
@@ -121,50 +130,73 @@ files:
 - solr/server/solr-webapp/webapp/WEB-INF/lib/commons-codec-1.10.jar
 - solr/server/solr-webapp/webapp/WEB-INF/lib/commons-collections-3.2.1.jar
 - solr/server/solr-webapp/webapp/WEB-INF/lib/commons-configuration-1.6.jar
+- solr/server/solr-webapp/webapp/WEB-INF/lib/commons-exec-1.3.jar
 - solr/server/solr-webapp/webapp/WEB-INF/lib/commons-fileupload-1.2.1.jar
 - solr/server/solr-webapp/webapp/WEB-INF/lib/commons-io-2.4.jar
 - solr/server/solr-webapp/webapp/WEB-INF/lib/commons-lang-2.6.jar
 - solr/server/solr-webapp/webapp/WEB-INF/lib/concurrentlinkedhashmap-lru-1.2.jar
 - solr/server/solr-webapp/webapp/WEB-INF/lib/dom4j-1.6.1.jar
 - solr/server/solr-webapp/webapp/WEB-INF/lib/guava-14.0.1.jar
-- solr/server/solr-webapp/webapp/WEB-INF/lib/hadoop-annotations-2.3.0.jar
-- solr/server/solr-webapp/webapp/WEB-INF/lib/hadoop-auth-2.3.0.jar
-- solr/server/solr-webapp/webapp/WEB-INF/lib/hadoop-common-2.3.0.jar
-- solr/server/solr-webapp/webapp/WEB-INF/lib/hadoop-hdfs-2.3.0.jar
+- solr/server/solr-webapp/webapp/WEB-INF/lib/hadoop-annotations-2.6.0.jar
+- solr/server/solr-webapp/webapp/WEB-INF/lib/hadoop-auth-2.6.0.jar
+- solr/server/solr-webapp/webapp/WEB-INF/lib/hadoop-common-2.6.0.jar
+- solr/server/solr-webapp/webapp/WEB-INF/lib/hadoop-hdfs-2.6.0.jar
 - solr/server/solr-webapp/webapp/WEB-INF/lib/hppc-0.5.2.jar
-- solr/server/solr-webapp/webapp/WEB-INF/lib/httpclient-4.3.1.jar
-- solr/server/solr-webapp/webapp/WEB-INF/lib/httpcore-4.3.jar
-- solr/server/solr-webapp/webapp/WEB-INF/lib/httpmime-4.3.1.jar
+- solr/server/solr-webapp/webapp/WEB-INF/lib/htrace-core-3.0.4.jar
+- solr/server/solr-webapp/webapp/WEB-INF/lib/httpclient-4.4.1.jar
+- solr/server/solr-webapp/webapp/WEB-INF/lib/httpcore-4.4.1.jar
+- solr/server/solr-webapp/webapp/WEB-INF/lib/httpmime-4.4.1.jar
+- solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-core-2.5.4.jar
+- solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-dataformat-smile-2.5.4.jar
 - solr/server/solr-webapp/webapp/WEB-INF/lib/joda-time-2.2.jar
-- solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-common-5.0.0.jar
-- solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-kuromoji-5.0.0.jar
-- solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-phonetic-5.0.0.jar
-- solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-backward-codecs-5.0.0.jar
-- solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-codecs-5.0.0.jar
-- solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-core-5.0.0.jar
-- solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-expressions-5.0.0.jar
-- solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-grouping-5.0.0.jar
-- solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-highlighter-5.0.0.jar
-- solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-join-5.0.0.jar
-- solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-memory-5.0.0.jar
-- solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-misc-5.0.0.jar
-- solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-queries-5.0.0.jar
-- solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-queryparser-5.0.0.jar
-- solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-spatial-5.0.0.jar
-- solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-suggest-5.0.0.jar
+- solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-common-5.3.1.jar
+- solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-kuromoji-5.3.1.jar
+- solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-phonetic-5.3.1.jar
+- solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-backward-codecs-5.3.1.jar
+- solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-codecs-5.3.1.jar
+- solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-core-5.3.1.jar
+- solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-expressions-5.3.1.jar
+- solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-grouping-5.3.1.jar
+- solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-highlighter-5.3.1.jar
+- solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-join-5.3.1.jar
+- solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-memory-5.3.1.jar
+- solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-misc-5.3.1.jar
+- solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-queries-5.3.1.jar
+- solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-queryparser-5.3.1.jar
+- solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-sandbox-5.3.1.jar
+- solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-spatial-5.3.1.jar
+- solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-suggest-5.3.1.jar
 - solr/server/solr-webapp/webapp/WEB-INF/lib/noggit-0.6.jar
-- solr/server/solr-webapp/webapp/WEB-INF/lib/org.restlet-2.1.1.jar
-- solr/server/solr-webapp/webapp/WEB-INF/lib/org.restlet.ext.servlet-2.1.1.jar
+- solr/server/solr-webapp/webapp/WEB-INF/lib/org.restlet-2.3.0.jar
+- solr/server/solr-webapp/webapp/WEB-INF/lib/org.restlet.ext.servlet-2.3.0.jar
 - solr/server/solr-webapp/webapp/WEB-INF/lib/protobuf-java-2.5.0.jar
-- solr/server/solr-webapp/webapp/WEB-INF/lib/solr-core-5.0.0.jar
-- solr/server/solr-webapp/webapp/WEB-INF/lib/solr-solrj-5.0.0.jar
+- solr/server/solr-webapp/webapp/WEB-INF/lib/solr-core-5.3.1.jar
+- solr/server/solr-webapp/webapp/WEB-INF/lib/solr-solrj-5.3.1.jar
 - solr/server/solr-webapp/webapp/WEB-INF/lib/spatial4j-0.4.1.jar
 - solr/server/solr-webapp/webapp/WEB-INF/lib/stax2-api-3.1.4.jar
+- solr/server/solr-webapp/webapp/WEB-INF/lib/t-digest-3.1.jar
 - solr/server/solr-webapp/webapp/WEB-INF/lib/woodstox-core-asl-4.4.1.jar
 - solr/server/solr-webapp/webapp/WEB-INF/lib/zookeeper-3.4.6.jar
 - solr/server/solr-webapp/webapp/WEB-INF/web.xml
 - solr/server/solr-webapp/webapp/WEB-INF/weblogic.xml
 - solr/server/solr-webapp/webapp/admin.html
+- solr/server/solr-webapp/webapp/css/angular/analysis.css
+- solr/server/solr-webapp/webapp/css/angular/chosen.css
+- solr/server/solr-webapp/webapp/css/angular/cloud.css
+- solr/server/solr-webapp/webapp/css/angular/common.css
+- solr/server/solr-webapp/webapp/css/angular/cores.css
+- solr/server/solr-webapp/webapp/css/angular/dataimport.css
+- solr/server/solr-webapp/webapp/css/angular/documents.css
+- solr/server/solr-webapp/webapp/css/angular/files.css
+- solr/server/solr-webapp/webapp/css/angular/index.css
+- solr/server/solr-webapp/webapp/css/angular/logging.css
+- solr/server/solr-webapp/webapp/css/angular/menu.css
+- solr/server/solr-webapp/webapp/css/angular/plugins.css
+- solr/server/solr-webapp/webapp/css/angular/query.css
+- solr/server/solr-webapp/webapp/css/angular/replication.css
+- solr/server/solr-webapp/webapp/css/angular/schema-browser.css
+- solr/server/solr-webapp/webapp/css/angular/segments.css
+- solr/server/solr-webapp/webapp/css/angular/threads.css
 - solr/server/solr-webapp/webapp/css/chosen.css
 - solr/server/solr-webapp/webapp/css/styles/analysis.css
 - solr/server/solr-webapp/webapp/css/styles/cloud.css
@@ -182,9 +214,11 @@ files:
 - solr/server/solr-webapp/webapp/css/styles/query.css
 - solr/server/solr-webapp/webapp/css/styles/replication.css
 - solr/server/solr-webapp/webapp/css/styles/schema-browser.css
+- solr/server/solr-webapp/webapp/css/styles/segments.css
 - solr/server/solr-webapp/webapp/css/styles/threads.css
 - solr/server/solr-webapp/webapp/favicon.ico
 - solr/server/solr-webapp/webapp/img/ZeroClipboard.swf
+- solr/server/solr-webapp/webapp/img/chosen-sprite-2x.png
 - solr/server/solr-webapp/webapp/img/chosen-sprite.png
 - solr/server/solr-webapp/webapp/img/div.gif
 - solr/server/solr-webapp/webapp/img/favicon.ico
@@ -395,6 +429,25 @@ files:
 - solr/server/solr-webapp/webapp/img/solr-ico.png
 - solr/server/solr-webapp/webapp/img/solr.svg
 - solr/server/solr-webapp/webapp/img/tree.png
+- solr/server/solr-webapp/webapp/index.html
+- solr/server/solr-webapp/webapp/js/angular/app.js
+- solr/server/solr-webapp/webapp/js/angular/controllers/analysis.js
+- solr/server/solr-webapp/webapp/js/angular/controllers/cloud.js
+- solr/server/solr-webapp/webapp/js/angular/controllers/core-overview.js
+- solr/server/solr-webapp/webapp/js/angular/controllers/cores.js
+- solr/server/solr-webapp/webapp/js/angular/controllers/dataimport.js
+- solr/server/solr-webapp/webapp/js/angular/controllers/documents.js
+- solr/server/solr-webapp/webapp/js/angular/controllers/files.js
+- solr/server/solr-webapp/webapp/js/angular/controllers/index.js
+- solr/server/solr-webapp/webapp/js/angular/controllers/java-properties.js
+- solr/server/solr-webapp/webapp/js/angular/controllers/logging.js
+- solr/server/solr-webapp/webapp/js/angular/controllers/plugins.js
+- solr/server/solr-webapp/webapp/js/angular/controllers/query.js
+- solr/server/solr-webapp/webapp/js/angular/controllers/replication.js
+- solr/server/solr-webapp/webapp/js/angular/controllers/schema-browser.js
+- solr/server/solr-webapp/webapp/js/angular/controllers/segments.js
+- solr/server/solr-webapp/webapp/js/angular/controllers/threads.js
+- solr/server/solr-webapp/webapp/js/angular/services.js
 - solr/server/solr-webapp/webapp/js/lib/ZeroClipboard.js
 - solr/server/solr-webapp/webapp/js/lib/chosen.js
 - solr/server/solr-webapp/webapp/js/lib/console.js
@@ -409,6 +462,7 @@ files:
 - solr/server/solr-webapp/webapp/js/lib/jquery.sammy.js
 - solr/server/solr-webapp/webapp/js/lib/jquery.timeago.js
 - solr/server/solr-webapp/webapp/js/lib/linker.js
+- solr/server/solr-webapp/webapp/js/lib/naturalSort.js
 - solr/server/solr-webapp/webapp/js/lib/order.js
 - solr/server/solr-webapp/webapp/js/main.js
 - solr/server/solr-webapp/webapp/js/require.js
@@ -428,7 +482,42 @@ files:
 - solr/server/solr-webapp/webapp/js/scripts/query.js
 - solr/server/solr-webapp/webapp/js/scripts/replication.js
 - solr/server/solr-webapp/webapp/js/scripts/schema-browser.js
+- solr/server/solr-webapp/webapp/js/scripts/segments.js
 - solr/server/solr-webapp/webapp/js/scripts/threads.js
+- solr/server/solr-webapp/webapp/libs/angular-chosen.js
+- solr/server/solr-webapp/webapp/libs/angular-cookies.js
+- solr/server/solr-webapp/webapp/libs/angular-cookies.min.js
+- solr/server/solr-webapp/webapp/libs/angular-resource.min.js
+- solr/server/solr-webapp/webapp/libs/angular-route.js
+- solr/server/solr-webapp/webapp/libs/angular-route.min.js
+- solr/server/solr-webapp/webapp/libs/angular-sanitize.js
+- solr/server/solr-webapp/webapp/libs/angular-sanitize.min.js
+- solr/server/solr-webapp/webapp/libs/angular.js
+- solr/server/solr-webapp/webapp/libs/angular.min.js
+- solr/server/solr-webapp/webapp/libs/chosen.jquery.js
+- solr/server/solr-webapp/webapp/libs/chosen.jquery.min.js
+- solr/server/solr-webapp/webapp/libs/d3.js
+- solr/server/solr-webapp/webapp/libs/highlight.js
+- solr/server/solr-webapp/webapp/libs/jquery-2.1.3.min.js
+- solr/server/solr-webapp/webapp/libs/jquery.jstree.js
+- solr/server/solr-webapp/webapp/libs/ngtimeago.js
+- solr/server/solr-webapp/webapp/partials/analysis.html
+- solr/server/solr-webapp/webapp/partials/cloud.html
+- solr/server/solr-webapp/webapp/partials/core_overview.html
+- solr/server/solr-webapp/webapp/partials/cores.html
+- solr/server/solr-webapp/webapp/partials/dataimport.html
+- solr/server/solr-webapp/webapp/partials/documents.html
+- solr/server/solr-webapp/webapp/partials/files.html
+- solr/server/solr-webapp/webapp/partials/index.html
+- solr/server/solr-webapp/webapp/partials/java-properties.html
+- solr/server/solr-webapp/webapp/partials/logging-levels.html
+- solr/server/solr-webapp/webapp/partials/logging.html
+- solr/server/solr-webapp/webapp/partials/plugins.html
+- solr/server/solr-webapp/webapp/partials/query.html
+- solr/server/solr-webapp/webapp/partials/replication.html
+- solr/server/solr-webapp/webapp/partials/schema-browser.html
+- solr/server/solr-webapp/webapp/partials/segments.html
+- solr/server/solr-webapp/webapp/partials/threads.html
 - solr/server/solr-webapp/webapp/tpl/analysis.html
 - solr/server/solr-webapp/webapp/tpl/cloud.html
 - solr/server/solr-webapp/webapp/tpl/cores.html
@@ -442,12 +531,12 @@ files:
 - solr/server/solr-webapp/webapp/tpl/query.html
 - solr/server/solr-webapp/webapp/tpl/replication.html
 - solr/server/solr-webapp/webapp/tpl/schema-browser.html
+- solr/server/solr-webapp/webapp/tpl/segments.html
 - solr/server/solr-webapp/webapp/tpl/threads.html
 - solr/server/solr/README.txt
 - solr/server/solr/solr.xml
 - solr/server/solr/zoo.cfg
 - solr/server/start.jar
-- solr/server/webapps/solr.war
 - solr/solr/.gitignore
 - solr/solr/README.txt
 - solr/solr/configsets/sunspot/conf/_rest_managed.json

data/solr/server/solr-webapp/webapp/.gitignore

@@ -1 +0,0 @@
-META-INF/*