rjack-solr 4.1.0.0-java → 4.2.1.0-java

data/History.rdoc

@@ -1,3 +1,8 @@
+=== 4.2.1.0 (2013-5-5)
+* Upgrade to Solr 4.2.1
+* Upgrades lucene ~> 4.2.1; rjack-jetty >= 7.6.9, < 9.1;
+  commons-codec >= 1.7.0, < 1.9.
+
 === 4.1.0.0 (2013-2-6)
 * Upgrade to Solr 4.1.0
 * Upgrades httpclient-4 ~> 4.2.3, zookeeper ~> 3.4.5,

data/Manifest.txt

@@ -21,7 +21,9 @@ 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
@@ -181,6 +183,7 @@ 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/home.png
 webapp/img/ico/hourglass--exclamation.png
 webapp/img/ico/hourglass.png
 webapp/img/ico/inbox-document-text.png
@@ -263,7 +266,6 @@ webapp/js/lib/jquery.cookie.js
 webapp/js/lib/jquery.form.js
 webapp/js/lib/jquery.jstree.js
 webapp/js/lib/jquery.sammy.js
-webapp/js/lib/jquery.sparkline.js
 webapp/js/lib/jquery.timeago.js
 webapp/js/lib/linker.js
 webapp/js/lib/order.js
@@ -303,5 +305,7 @@ 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.1.0.jar
-lib/rjack-solr/solr-solrj-4.1.0.jar
+lib/rjack-solr/org.restlet-2.1.1.jar
+lib/rjack-solr/org.restlet.ext.servlet-2.1.1.jar
+lib/rjack-solr/solr-core-4.2.1.jar
+lib/rjack-solr/solr-solrj-4.2.1.jar

data/Rakefile

@@ -8,5 +8,6 @@ RJack::TarPit.new( 'rjack-solr' ) do |tp|
 
   tp.rdoc_destinations <<
     'dekellum@rubyforge.org:/var/www/gforge-projects/rjack/solr'
+  tp.publish_rdoc_rsync_flags = %w[ -rL ]
 
 end

data/init/rjack-solr

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

data/lib/rjack-solr/base.rb

@@ -18,7 +18,7 @@ module RJack
   module Solr
 
     # SOLR (java) version
-    CORE_VERSION = '4.1.0'
+    CORE_VERSION = '4.2.1'
 
     # 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.1.0</version>
+      <version>4.2.1</version>
       <exclusions>
         <!-- <exclusion>
           <groupId>com.google.guava</groupId>
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>org.apache.solr</groupId>
       <artifactId>solr</artifactId>
-      <version>4.1.0</version>
+      <version>4.2.1</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_37-b06-434-11M3909 (Apple Inc.)
+Created-By: 1.6.0_27-b27 (Sun Microsystems Inc.)
 Extension-Name: org.apache.solr
 Specification-Title: Apache Solr Search Server
-Specification-Version: 4.1.0.2013.01.16.17.23.22
+Specification-Version: 4.2.1.2013.03.26.08.28.55
 Specification-Vendor: The Apache Software Foundation
 Implementation-Title: org.apache.solr
-Implementation-Version: 4.1.0 1434440 - sarowe - 2013-01-16 17:23:22
+Implementation-Version: 4.2.1 1461071 - mark - 2013-03-26 08:28:55
 Implementation-Vendor: The Apache Software Foundation
 X-Compile-Source-JDK: 1.6
 X-Compile-Target-JDK: 1.6

data/webapp/META-INF/NOTICE.txt

@@ -503,3 +503,15 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=========================================================================
+==     Restlet Notice                                                  ==
+=========================================================================
+
+Copyright (C) 2005-2013 Restlet S.A.S.
+
+Restlet is a registered trademark of Restlet S.A.S.
+
+This product contains software developed by the Restlet project.
+
+See http://www.restlet.org/

data/webapp/WEB-INF/web.xml

@@ -125,6 +125,15 @@
       <param-value>${context}/#/~logging</param-value>
     </init-param>
   </servlet>
+
+  <servlet>
+    <servlet-name>SchemaRestApi</servlet-name>
+    <servlet-class>org.restlet.ext.servlet.ServerServlet</servlet-class>
+    <init-param>
+      <param-name>org.restlet.application</param-name>
+      <param-value>org.apache.solr.rest.SchemaRestApi</param-value>
+    </init-param>
+  </servlet>
   
   <servlet-mapping>
     <servlet-name>RedirectOldAdminUI</servlet-name>
@@ -153,6 +162,11 @@
     <servlet-name>LoadAdminUI</servlet-name>
     <url-pattern>/admin.html</url-pattern>
   </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>SchemaRestApi</servlet-name>
+    <url-pattern>/schema/*</url-pattern>
+  </servlet-mapping>
   
   <mime-mapping>
     <extension>.xsl</extension>

data/webapp/admin.html

@@ -111,8 +111,12 @@ limitations under the License.
             
           </ul>
 
-          <ul id="menu-selector">
-          </ul>
+          <div id="core-selector">
+            <select data-placeholder="Core Selector"></select>
+          </div>
+          <div id="core-menu">
+            <ul></ul>
+          </div>
                   
         </div>
       </div>

data/webapp/css/styles/analysis.css

@@ -82,10 +82,9 @@
   float: right;
 }
 
-#content #analysis .settings button.loader
+#content #analysis .settings button span
 {
-  background-position: 2px 50%;
-  padding-left: 21px;
+  background-image: url( ../../img/ico/funnel.png );
 }
 
 #content #analysis .settings .verbose_output

data/webapp/css/styles/cloud.css

@@ -231,11 +231,39 @@
   color: #00f;
 }
 
+#content #cloud #legend
+{
+  border: 1px solid #f0f0f0;
+  padding: 10px;
+  position: absolute;
+  right: 0;
+  bottom: 0;
+}
+
+#content #cloud #legend li
+{
+  padding-left: 15px;
+  position: relative;
+}
+
+#content #cloud #legend li svg
+{
+  position: absolute;
+  left: 0;
+  top: 2px;
+}
+
+#content #graph-content
+{
+  min-height: 400px;
+}
+
 #content #graph-content .node
 {
   fill: #333;
 }
 
+#content #cloud #legend circle,
 #content #graph-content .node circle
 {
   fill: #fff;
@@ -265,6 +293,7 @@
   stroke-width: 1.5px;
 }
 
+#content #cloud #legend .gone circle,
 #content #graph-content .node.gone circle,
 #content #graph-content .link.gone
 {
@@ -276,8 +305,16 @@
   fill: #f0f0f0;
 }
 
+#content #cloud #legend ul .gone
+{
+  color: #e0e0e0;
+}
+
+#content #cloud #legend .recovery_failed,
+#content #cloud #legend .recovery_failed circle,
 #content #graph-content .node.recovery_failed circle
 {
+  color: #C43C35;
   stroke: #C43C35;
 }
 
@@ -286,8 +323,11 @@
   fill: #C43C35;
 }
 
+#content #cloud #legend .down,
+#content #cloud #legend .down circle,
 #content #graph-content .node.down circle
 {
+  color: #c48f00;
   stroke: #c48f00;
 }
 
@@ -296,8 +336,11 @@
   fill: #c48f00;
 }
 
+#content #cloud #legend .recovering,
+#content #cloud #legend .recovering circle,
 #content #graph-content .node.recovering circle
 {
+  color: #d5dd00;
   stroke: #d5dd00;
 }
 
@@ -306,8 +349,11 @@
   fill: #d5dd00;
 }
 
+#content #cloud #legend .active,
+#content #cloud #legend .active circle,
 #content #graph-content .node.active circle
 {
+  color: #57A957;
   stroke: #57A957;
 }
 
@@ -316,11 +362,17 @@
   fill: #57A957;
 }
 
+#content #cloud #legend .leader circle,
 #content #graph-content .node.leader circle
 {
   fill: #000;
 }
 
+#content #cloud #legend .leader circle
+{
+  stroke: #fff;
+}
+
 #content #graph-content .link.lvl-2,
 #content #graph-content .link.leader
 {

data/webapp/css/styles/common.css

@@ -172,7 +172,7 @@ ul
 #header
 {
   padding-bottom: 10px;
-  position: absolute;
+  position: fixed;
   z-index: 42;
 }
 
@@ -340,12 +340,6 @@ ul
   width: 100%;
 }
 
-#content > pre
-{
-  max-height: 600px;
-  overflow: auto;
-}
-
 #content .block
 {
   margin-bottom: 10px;

data/webapp/css/styles/index.css

@@ -98,11 +98,6 @@
   padding-bottom: 3px;
 }
 
-#content #index .data li.odd
-{
-  color: #c0c0c0;
-}
-
 #content #index .data li dt
 {
   float: left;

data/webapp/css/styles/menu.css

@@ -1,13 +1,13 @@
 #menu-wrapper
 {
-  position: absolute;
-  top: 90px;
+  position: fixed;
+  top: 120px;
   width: 150px;
 }
 
 .has-environment #menu-wrapper
 {
-  top: 130px;
+  top: 160px;
 }
 
 #menu-wrapper a
@@ -18,6 +18,23 @@
   text-overflow: ellipsis;
 }
 
+#core-selector
+{
+  margin-top: 20px;
+  padding-right: 10px;
+}
+
+#core-selector a
+{
+  padding: 0;
+  padding-left: 8px;
+}
+
+#core-selector select
+{
+  width: 100%;
+}
+
 #menu-wrapper .active p
 {
   background-color: #fafafa;
@@ -121,32 +138,27 @@
   display: none;
 }
 
-#menu-selector
-{
-  margin-top: 20px;
-}
-
-#menu-selector p
+#core-menu p
 {
   border-top: 1px solid #f0f0f0;
 }
 
-#menu-selector li:first-child p
+#core-menu li:first-child p
 {
   border-top: 0;
 }
 
-#menu-selector p a
+#core-menu p a
 {
   background-image: url( ../../img/ico/status-offline.png );
 }
 
-#menu-selector .active p a
+#core-menu .active p a
 {
   background-image: url( ../../img/ico/box.png );
 }
 
-#menu-selector ul,
+#core-menu ul,
 #menu ul
 {
   display: none;
@@ -154,7 +166,7 @@
   padding-bottom: 10px;
 }
 
-#menu-selector .active ul,
+#core-menu .active ul,
 #menu .active ul
 {
   display: block;
@@ -165,7 +177,7 @@
   border-bottom: 0;
 }
 
-#menu-selector ul li a,
+#core-menu ul li a,
 #menu ul li a
 {
   background-position: 7px 50%;
@@ -175,20 +187,20 @@
   padding-left: 26px;
 }
 
-#menu-selector ul li:last-child a,
+#core-menu ul li:last-child a,
 #menu ul li:last-child a
 {
   border-bottom: 0;
 }
 
-#menu-selector ul li a:hover,
+#core-menu ul li a:hover,
 #menu ul li a:hover
 {
   background-color: #f0f0f0;
   color: #333;
 }
 
-#menu-selector ul li.active a,
+#core-menu ul li.active a,
 #menu ul li.active a
 {
   background-color: #d0d0d0;
@@ -213,7 +225,7 @@
 #menu #cloud.global .rgraph a { background-image: url( ../../img/ico/asterisk.png ); }
 #menu #cloud.global .dump a { background-image: url( ../../img/ico/download-cloud.png ); }
 
-#menu-selector .ping.error a
+#core-menu .ping.error a
 {
   
   background-color: #ffcccc;
@@ -222,17 +234,18 @@
   cursor: help;
 }
 
-#menu-selector .query a { background-image: url( ../../img/ico/magnifier.png ); }
-#menu-selector .schema a { background-image: url( ../../img/ico/table.png ); }
-#menu-selector .config a { background-image: url( ../../img/ico/gear.png ); }
-#menu-selector .analysis a { background-image: url( ../../img/ico/funnel.png ); }
-#menu-selector .schema-browser a { background-image: url( ../../img/ico/book-open-text.png ); }
-#menu-selector .replication a { background-image: url( ../../img/ico/node.png ); }
-#menu-selector .distribution a { background-image: url( ../../img/ico/node-select.png ); }
-#menu-selector .ping a { background-image: url( ../../img/ico/system-monitor.png ); }
-#menu-selector .logging a { background-image: url( ../../img/ico/inbox-document-text.png ); }
-#menu-selector .plugins a { background-image: url( ../../img/ico/block.png ); }
-#menu-selector .dataimport a { background-image: url( ../../img/ico/document-import.png ); }
+#core-menu .overview a { background-image: url( ../../img/ico/home.png ); }
+#core-menu .query a { background-image: url( ../../img/ico/magnifier.png ); }
+#core-menu .schema a { background-image: url( ../../img/ico/table.png ); }
+#core-menu .config a { background-image: url( ../../img/ico/gear.png ); }
+#core-menu .analysis a { background-image: url( ../../img/ico/funnel.png ); }
+#core-menu .schema-browser a { background-image: url( ../../img/ico/book-open-text.png ); }
+#core-menu .replication a { background-image: url( ../../img/ico/node.png ); }
+#core-menu .distribution a { background-image: url( ../../img/ico/node-select.png ); }
+#core-menu .ping a { background-image: url( ../../img/ico/system-monitor.png ); }
+#core-menu .logging a { background-image: url( ../../img/ico/inbox-document-text.png ); }
+#core-menu .plugins a { background-image: url( ../../img/ico/block.png ); }
+#core-menu .dataimport a { background-image: url( ../../img/ico/document-import.png ); }
 
 
 #content #navigation