rjack-solr 4.0.0.0-java → 4.1.0.0-java

data/History.rdoc

@@ -1,3 +1,8 @@
+=== 4.1.0.0 (2013-2-6)
+* Upgrade to Solr 4.1.0
+* Upgrades httpclient-4 ~> 4.2.3, zookeeper ~> 3.4.5,
+  commons-codec ~> 1.7.0
+
 === 4.0.0.0 (2013-1-3)
 * Upgrade to Solr 4.0.0
 * Introduces new dependencies on lucene ~> 4.0.0,

data/Manifest.txt

@@ -21,9 +21,7 @@ webapp/WEB-INF
 webapp/WEB-INF/lib
 webapp/WEB-INF/web.xml
 webapp/WEB-INF/weblogic.xml
-webapp/admin
 webapp/admin.html
-webapp/admin/replication
 webapp/css
 webapp/css/chosen.css
 webapp/css/styles
@@ -158,6 +156,7 @@ webapp/img/ico/clock-select.png
 webapp/img/ico/construction.png
 webapp/img/ico/cross-0.png
 webapp/img/ico/cross-1.png
+webapp/img/ico/cross-button.png
 webapp/img/ico/cross.png
 webapp/img/ico/dashboard.png
 webapp/img/ico/database.png
@@ -179,6 +178,7 @@ webapp/img/ico/gear.png
 webapp/img/ico/globe-network.png
 webapp/img/ico/globe.png
 webapp/img/ico/hammer-screwdriver.png
+webapp/img/ico/hammer.png
 webapp/img/ico/hand.png
 webapp/img/ico/highlighter-text.png
 webapp/img/ico/hourglass--exclamation.png
@@ -257,6 +257,7 @@ webapp/js/lib/console.js
 webapp/js/lib/d3.js
 webapp/js/lib/highlight.js
 webapp/js/lib/jquery-1.7.2.min.js
+webapp/js/lib/jquery.autogrow.js
 webapp/js/lib/jquery.blockUI.js
 webapp/js/lib/jquery.cookie.js
 webapp/js/lib/jquery.form.js
@@ -302,5 +303,5 @@ lib/rjack-solr/commons-cli-1.2.jar
 lib/rjack-solr/commons-fileupload-1.2.1.jar
 lib/rjack-solr/commons-io-2.1.jar
 lib/rjack-solr/commons-lang-2.6.jar
-lib/rjack-solr/solr-core-4.0.0.jar
-lib/rjack-solr/solr-solrj-4.0.0.jar
+lib/rjack-solr/solr-core-4.1.0.jar
+lib/rjack-solr/solr-solrj-4.1.0.jar

data/README.rdoc

@@ -16,7 +16,7 @@ release's sample config:
 
   % mkdir -p /var/local/rjack-solr
   % cd /var/local/rjack-solr
-  % svn checkout http://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_4_0_0/solr/example/solr/collection1
+  % svn checkout http://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_4_1_0/solr/example/solr/collection1
 
   # Edit collection1/conf/schema.xml and remove/comment out the text_ja fieldType
   # The Kuromoji Japanese Morphological is not included in

data/init/rjack-solr

@@ -23,7 +23,7 @@
 #++
 
 require 'rubygems'
-gem( "rjack-solr", "= 4.0.0.0" )
+gem( "rjack-solr", "= 4.1.0.0" )
 
 module BinScript
 

data/lib/rjack-solr/base.rb

@@ -18,7 +18,7 @@ module RJack
   module Solr
 
     # SOLR (java) version
-    CORE_VERSION = '4.0.0'
+    CORE_VERSION = '4.1.0'
 
     # rjack gem version
     VERSION = CORE_VERSION + '.0'

data/pom.xml

@@ -15,7 +15,7 @@
     <dependency>
       <groupId>org.apache.solr</groupId>
       <artifactId>solr-core</artifactId>
-      <version>4.0.0</version>
+      <version>4.1.0</version>
       <exclusions>
         <!-- <exclusion>
           <groupId>com.google.guava</groupId>
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>org.apache.solr</groupId>
       <artifactId>solr</artifactId>
-      <version>4.0.0</version>
+      <version>4.1.0</version>
       <type>war</type>
     </dependency>
   </dependencies>

data/webapp/META-INF/MANIFEST.MF

@@ -1,12 +1,12 @@
 Manifest-Version: 1.0
 Ant-Version: Apache Ant 1.8.2
-Created-By: 1.6.0_27-b07 (Sun Microsystems Inc.)
+Created-By: 1.6.0_37-b06-434-11M3909 (Apple Inc.)
 Extension-Name: org.apache.solr
 Specification-Title: Apache Solr Search Server
-Specification-Version: 4.0.0.2012.10.06.03.05.54
+Specification-Version: 4.1.0.2013.01.16.17.23.22
 Specification-Vendor: The Apache Software Foundation
 Implementation-Title: org.apache.solr
-Implementation-Version: 4.0.0 1394950 - rmuir - 2012-10-06 03:05:54
+Implementation-Version: 4.1.0 1434440 - sarowe - 2013-01-16 17:23:22
 Implementation-Vendor: The Apache Software Foundation
 X-Compile-Source-JDK: 1.6
 X-Compile-Target-JDK: 1.6

data/webapp/META-INF/NOTICE.txt

@@ -1,6 +1,6 @@
 ==============================================================
  Apache Solr
- Copyright 2006-2012 The Apache Software Foundation
+ Copyright 2006-2013 The Apache Software Foundation
 ==============================================================
 
 This product includes software developed by
@@ -41,7 +41,7 @@ License: http://hsqldb.org/web/hsqlLicense.html
 =========================================================================
 
 Apache Lucene
-Copyright 2012 The Apache Software Foundation
+Copyright 2013 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

data/webapp/admin.html

@@ -1,3 +1,4 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 
 <!--

data/webapp/css/styles/cloud.css

@@ -18,7 +18,7 @@
 {
   background-color: #f00;
   background-image: url( ../../img/ico/construction.png );
-  background-position: 10px 50%;
+  background-position: 10px 12px;
   color: #fff;
   font-weight: bold;
   margin-bottom: 20px;
@@ -26,6 +26,13 @@
   padding-left: 35px;
 }
 
+#content #cloud #error .msg
+{
+  font-style: italic;
+  font-weight: normal;
+  margin-top: 10px;
+}
+
 #content #cloud #debug
 {
   background-color: #fff;

data/webapp/css/styles/common.css

@@ -417,6 +417,16 @@ pre.syntax .hexcolor
   color: #40a070;
 }
 
+pre.syntax.language-json .number
+{
+  color: blue;
+}
+
+pre.syntax.language-json .literal
+{
+  color: firebrick;
+}
+
 pre.syntax .string,
 pre.syntax .tag .value,
 pre.syntax .phpdoc,
@@ -425,6 +435,11 @@ pre.syntax .tex .formula
   color: #d14;
 }
 
+pre.syntax.language-json .string
+{
+  color: green;
+}
+
 pre.syntax .title,
 pre.syntax .id
 {
@@ -464,6 +479,12 @@ pre.syntax .lisp .body
   color: #008080;
 }
 
+pre.syntax.language-json .attribute
+{
+  color: black;
+  font-weight: bold;
+}
+
 pre.syntax .regexp
 {
   color: #009926;

data/webapp/css/styles/dashboard.css

@@ -108,8 +108,8 @@
 #content #dashboard #system h2 { background-image: url( ../../img/ico/server.png ); }
 #content #dashboard #statistics h2 { background-image: url( ../../img/ico/chart.png ); }
 #content #dashboard #replication h2 { background-image: url( ../../img/ico/node.png ); }
-#content #dashboard #replication.is-master h2 { background-image: url( ../../img/ico/node-master.png ); }
-#content #dashboard #replication.is-slave h2 { background-image: url( ../../img/ico/node-slave.png ); }
+#content #dashboard #replication.master h2 { background-image: url( ../../img/ico/node-master.png ); }
+#content #dashboard #replication.slave h2 { background-image: url( ../../img/ico/node-slave.png ); }
 #content #dashboard #dataimport h2 { background-image: url( ../../img/ico/document-import.png ); }
 #content #dashboard #admin-extra h2 { background-image: url( ../../img/ico/plus-button.png ); }
 

data/webapp/css/styles/dataimport.css

@@ -29,7 +29,7 @@
 
 #content #dataimport #form #navigation .current a
 {
-  background-image: url( ../../img/ico/document-import.png );
+  background-image: url( ../../img/ico/status.png );
 }
 
 #content #dataimport #form form
@@ -60,27 +60,41 @@
   width: 100%;
 }
 
+#content #dataimport #form input
+{
+  width: 98%;
+}
+
 #content #dataimport #form button
 {
   margin-top: 10px;
 }
 
-#content #dataimport #form button.loader
+#content #dataimport #form .execute span
 {
-  background-position: 2px 50%;
-  padding-left: 23px;
+  background-image: url( ../../img/ico/document-import.png );
+}
+
+#content #dataimport #form .refresh-status span
+{
+  background-image: url( ../../img/ico/arrow-circle.png );
+}
+
+#content #dataimport #form .refresh-status span.success
+{
+  background-image: url( ../../img/ico/tick.png );
 }
 
 #content #dataimport #form #start
 {
   float: left;
-  margin-right: 2%;
-  width: 49%;
+  width: 47%;
 }
 
 #content #dataimport #form #rows
 {
-  width: 49%;
+  float: right;
+  width: 47%;
 }
 
 #content #dataimport #form .checkbox input
@@ -89,9 +103,33 @@
   width: auto;
 }
 
+#content #dataimport #form #auto-refresh-status
+{
+  margin-top: 20px;
+}
+
+#content #dataimport #form #auto-refresh-status a
+{
+  background-image: url( ../../img/ico/ui-check-box-uncheck.png );
+  background-position: 0 50%;
+  color: #c0c0c0;
+  display: block;
+  padding-left: 21px;
+}
+
+#content #dataimport #form #auto-refresh-status a.on,
+#content #dataimport #form #auto-refresh-status a:hover
+{
+  color: #333;
+}
+
+#content #dataimport #form #auto-refresh-status a.on
+{
+  background-image: url( ../../img/ico/ui-check-box.png );
+}
+
 #content #dataimport #current_state
 {
-  display: none;
   padding: 10px;
   margin-bottom: 20px;
 }
@@ -101,14 +139,14 @@
   display: none !important;
 }
 
-#content #dataimport #current_state .time,
+#content #dataimport #current_state .last_update,
 #content #dataimport #current_state .info
 {
   display: block;
   padding-left: 21px;
 }
 
-#content #dataimport #current_state .time
+#content #dataimport #current_state .last_update
 {
   color: #c0c0c0;
   font-size: 11px;
@@ -117,6 +155,30 @@
 #content #dataimport #current_state .info
 {
   background-position: 0 1px;
+  position: relative;
+}
+
+#content #dataimport #current_state .info .details span
+{
+  color: #c0c0c0;
+}
+
+#content #dataimport #current_state .info .abort-import
+{
+  display: none;
+  position: absolute;
+  right: 0px;
+  top: 0px;
+}
+
+#content #dataimport #current_state .info .abort-import span
+{
+  background-image: url( ../../img/ico/cross.png );
+}
+
+#content #dataimport #current_state .info .abort-import.success span
+{
+  background-image: url( ../../img/ico/tick.png );
 }
 
 #content #dataimport #current_state.indexing
@@ -124,6 +186,16 @@
   background-color: #f9f9f9;
 }
 
+#content #dataimport #current_state.indexing .info
+{
+  background-image: url( ../../img/ico/hourglass.png );
+}
+
+#content #dataimport #current_state.indexing .info .abort-import
+{
+  display: block;
+}
+
 #content #dataimport #current_state.success
 {
   background-color: #e6f3e6;
@@ -139,6 +211,21 @@
   color: #080;
 }
 
+#content #dataimport #current_state.aborted
+{
+  background-color: #f3e6e6;
+}
+
+#content #dataimport #current_state.aborted .info
+{
+  background-image: url( ../../img/ico/slash.png );
+}
+
+#content #dataimport #current_state.aborted .info strong
+{
+  color: #800;
+}
+
 #content #dataimport #current_state.failure
 {
   background-color: #f3e6e6;
@@ -146,7 +233,7 @@
 
 #content #dataimport #current_state.failure .info
 {
-  background-image: url( ../../img/ico/slash.png );
+  background-image: url( ../../img/ico/cross-button.png );
 }
 
 #content #dataimport #current_state.failure .info strong
@@ -154,7 +241,17 @@
   color: #800;
 }
 
-#content #dataimport #config-error
+#content #dataimport #current_state.idle
+{
+  background-color: #e6e6ff;
+}
+
+#content #dataimport #current_state.idle .info
+{
+  background-image: url( ../../img/ico/information.png );
+}
+
+#content #dataimport #error
 {
   background-color: #f00;
   background-image: url( ../../img/ico/construction.png );
@@ -167,37 +264,43 @@
   padding-left: 35px;
 }
 
-#content #dataimport #config h2
+#content #dataimport .block h2
 {
   border-color: #c0c0c0;
   padding-left: 5px;
   position: relative;
 }
 
-#content #dataimport #config.hidden h2
+#content #dataimport .block.hidden h2
 {
   border-color: #fafafa;
 }
 
-#content #dataimport #config h2 a.toggle
+#content #dataimport .block h2 a.toggle
 {
   background-image: url( ../../img/ico/toggle-small.png );
   background-position: 0 50%;
   padding-left: 21px;
 }
 
-#content #dataimport #config.hidden h2 a.toggle
+#content #dataimport .block.hidden h2 a.toggle
 {
   background-image: url( ../../img/ico/toggle-small-expand.png );
 }
 
+#content #dataimport #config h2 a.r
+{
+  background-position: 3px 50%;
+  display: block;
+  float: right;
+  margin-left: 10px;
+  padding-left: 24px;
+  padding-right: 3px;
+}
+
 #content #dataimport #config h2 a.reload_config
 {
   background-image: url( ../../img/ico/arrow-circle.png );
-  padding-left: 21px;
-  position: absolute;
-  right: 5px;
-  top: 5px;
 }
 
 #content #dataimport #config h2 a.reload_config.success
@@ -210,13 +313,72 @@
   background-image: url( ../../img/ico/slash.png );
 }
 
-#content #dataimport #config.hidden .content
+#content #dataimport #config h2 a.debug_mode
+{
+  background-image: url( ../../img/ico/hammer.png );
+  color: #c0c0c0;
+}
+
+#content #dataimport #config.debug_mode h2 a.debug_mode
+{
+  background-color: #ff0;
+  background-image: url( ../../img/ico/hammer-screwdriver.png );
+  color: #333;
+}
+
+#content #dataimport .block.hidden .content
 {
   display: none;
 }
 
+#content #dataimport #config .content
+{
+  padding: 5px 2px;
+}
+
 #content #dataimport #dataimport_config .loader
 {
   background-position: 0 50%;
   padding-left: 21px;
+}
+
+#content #dataimport #dataimport_config .formatted
+{
+  border: 1px solid #fff;
+  display: block;
+  padding: 2px;
+}
+
+#content #dataimport .debug_mode #dataimport_config .formatted
+{
+  display: none;
+}
+
+#content #dataimport #dataimport_config .editable
+{
+  display: none;
+}
+
+#content #dataimport .debug_mode #dataimport_config .editable
+{
+  display: block;
+}
+
+#content #dataimport #dataimport_config .editable textarea
+{
+  font-family: monospace;
+  height: 120px;
+  min-height: 60px;
+  width: 100%;
+}
+
+#content #dataimport #debug_response
+{
+  display: none;
+}
+
+#content #dataimport #debug_response em
+{
+  color: #c0c0c0;
+  font-style: normal;
 }