rjack-solr 3.6.2.0-java → 4.0.0.0-java

data/History.rdoc

@@ -1,3 +1,8 @@
+=== 4.0.0.0 (2013-1-3)
+* Upgrade to Solr 4.0.0
+* Introduces new dependencies on lucene ~> 4.0.0,
+  httpclient-4 ~> 4.2.1, zookeeper ~> 3.3.6, guava ~> 13.0
+
 === 3.6.2.0 (2012-12-28)
 * Upgrade to Solr 3.6.2
 * Upgrade/broaden to rjack-jetty [7.6.7,9.1). This includes 9.0.0.1

data/Manifest.txt

@@ -22,50 +22,285 @@ webapp/WEB-INF/lib
 webapp/WEB-INF/web.xml
 webapp/WEB-INF/weblogic.xml
 webapp/admin
-webapp/admin/_info.jsp
-webapp/admin/action.jsp
-webapp/admin/analysis.jsp
-webapp/admin/analysis.xsl
-webapp/admin/dataimport.jsp
-webapp/admin/debug.jsp
-webapp/admin/distributiondump.jsp
-webapp/admin/favicon.ico
-webapp/admin/form.jsp
-webapp/admin/get-file.jsp
-webapp/admin/get-properties.jsp
-webapp/admin/header.jsp
-webapp/admin/index.jsp
-webapp/admin/jquery-1.4.3.min.js
-webapp/admin/meta.xsl
-webapp/admin/ping.jsp
-webapp/admin/ping.xsl
-webapp/admin/raw-schema.jsp
-webapp/admin/registry.jsp
-webapp/admin/registry.xsl
+webapp/admin.html
 webapp/admin/replication
-webapp/admin/replication/header.jsp
-webapp/admin/replication/index.jsp
-webapp/admin/schema.jsp
-webapp/admin/solr-admin.css
-webapp/admin/solr_small.png
-webapp/admin/stats.jsp
-webapp/admin/stats.xsl
-webapp/admin/tabular.xsl
-webapp/admin/threaddump.jsp
-webapp/admin/threaddump.xsl
 webapp/css
+webapp/css/chosen.css
 webapp/css/styles
+webapp/css/styles/analysis.css
+webapp/css/styles/cloud.css
+webapp/css/styles/common.css
+webapp/css/styles/cores.css
+webapp/css/styles/dashboard.css
+webapp/css/styles/dataimport.css
+webapp/css/styles/index.css
+webapp/css/styles/java-properties.css
+webapp/css/styles/logging.css
+webapp/css/styles/menu.css
+webapp/css/styles/plugins.css
+webapp/css/styles/query.css
+webapp/css/styles/replication.css
+webapp/css/styles/schema-browser.css
+webapp/css/styles/threads.css
 webapp/favicon.ico
 webapp/img
+webapp/img/ZeroClipboard.swf
+webapp/img/chosen-sprite.png
+webapp/img/div.gif
+webapp/img/favicon.ico
 webapp/img/filetypes
+webapp/img/filetypes/7z.png
+webapp/img/filetypes/README
+webapp/img/filetypes/ai.png
+webapp/img/filetypes/aiff.png
+webapp/img/filetypes/asc.png
+webapp/img/filetypes/audio.png
+webapp/img/filetypes/bin.png
+webapp/img/filetypes/bz2.png
+webapp/img/filetypes/c.png
+webapp/img/filetypes/cfc.png
+webapp/img/filetypes/cfm.png
+webapp/img/filetypes/chm.png
+webapp/img/filetypes/class.png
+webapp/img/filetypes/conf.png
+webapp/img/filetypes/cpp.png
+webapp/img/filetypes/cs.png
+webapp/img/filetypes/css.png
+webapp/img/filetypes/csv.png
+webapp/img/filetypes/deb.png
+webapp/img/filetypes/divx.png
+webapp/img/filetypes/doc.png
+webapp/img/filetypes/dot.png
+webapp/img/filetypes/eml.png
+webapp/img/filetypes/enc.png
+webapp/img/filetypes/file.png
+webapp/img/filetypes/gif.png
+webapp/img/filetypes/gz.png
+webapp/img/filetypes/hlp.png
+webapp/img/filetypes/htm.png
+webapp/img/filetypes/html.png
+webapp/img/filetypes/image.png
+webapp/img/filetypes/iso.png
+webapp/img/filetypes/jar.png
+webapp/img/filetypes/java.png
+webapp/img/filetypes/jpeg.png
+webapp/img/filetypes/jpg.png
+webapp/img/filetypes/js.png
+webapp/img/filetypes/lua.png
+webapp/img/filetypes/m.png
+webapp/img/filetypes/mm.png
+webapp/img/filetypes/mov.png
+webapp/img/filetypes/mp3.png
+webapp/img/filetypes/mpg.png
+webapp/img/filetypes/odc.png
+webapp/img/filetypes/odf.png
+webapp/img/filetypes/odg.png
+webapp/img/filetypes/odi.png
+webapp/img/filetypes/odp.png
+webapp/img/filetypes/ods.png
+webapp/img/filetypes/odt.png
+webapp/img/filetypes/ogg.png
+webapp/img/filetypes/pdf.png
+webapp/img/filetypes/pgp.png
+webapp/img/filetypes/php.png
+webapp/img/filetypes/pl.png
+webapp/img/filetypes/png.png
+webapp/img/filetypes/ppt.png
+webapp/img/filetypes/ps.png
+webapp/img/filetypes/py.png
+webapp/img/filetypes/ram.png
+webapp/img/filetypes/rar.png
+webapp/img/filetypes/rb.png
+webapp/img/filetypes/rm.png
+webapp/img/filetypes/rpm.png
+webapp/img/filetypes/rtf.png
+webapp/img/filetypes/sig.png
+webapp/img/filetypes/sql.png
+webapp/img/filetypes/swf.png
+webapp/img/filetypes/sxc.png
+webapp/img/filetypes/sxd.png
+webapp/img/filetypes/sxi.png
+webapp/img/filetypes/sxw.png
+webapp/img/filetypes/tar.png
+webapp/img/filetypes/tex.png
+webapp/img/filetypes/tgz.png
+webapp/img/filetypes/txt.png
+webapp/img/filetypes/vcf.png
+webapp/img/filetypes/video.png
+webapp/img/filetypes/vsd.png
+webapp/img/filetypes/wav.png
+webapp/img/filetypes/wma.png
+webapp/img/filetypes/wmv.png
+webapp/img/filetypes/xls.png
+webapp/img/filetypes/xml.png
+webapp/img/filetypes/xpi.png
+webapp/img/filetypes/xvid.png
+webapp/img/filetypes/zip.png
 webapp/img/ico
-webapp/index.jsp
+webapp/img/ico/arrow-000-small.png
+webapp/img/ico/arrow-circle.png
+webapp/img/ico/arrow-switch.png
+webapp/img/ico/asterisk.png
+webapp/img/ico/battery.png
+webapp/img/ico/block-small.png
+webapp/img/ico/block.png
+webapp/img/ico/book-open-text.png
+webapp/img/ico/box.png
+webapp/img/ico/bug.png
+webapp/img/ico/chart.png
+webapp/img/ico/chevron-small-expand.png
+webapp/img/ico/chevron-small.png
+webapp/img/ico/clipboard-list.png
+webapp/img/ico/clipboard-paste-document-text.png
+webapp/img/ico/clipboard-paste.png
+webapp/img/ico/clock-select-remain.png
+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.png
+webapp/img/ico/dashboard.png
+webapp/img/ico/database.png
+webapp/img/ico/databases.png
+webapp/img/ico/disk-black.png
+webapp/img/ico/document-convert.png
+webapp/img/ico/document-import.png
+webapp/img/ico/document-list.png
+webapp/img/ico/document-text.png
+webapp/img/ico/download-cloud.png
+webapp/img/ico/exclamation-button.png
+webapp/img/ico/eye.png
+webapp/img/ico/folder-export.png
+webapp/img/ico/folder-tree.png
+webapp/img/ico/folder.png
+webapp/img/ico/funnel-small.png
+webapp/img/ico/funnel.png
+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/hand.png
+webapp/img/ico/highlighter-text.png
+webapp/img/ico/hourglass--exclamation.png
+webapp/img/ico/hourglass.png
+webapp/img/ico/inbox-document-text.png
+webapp/img/ico/information-button.png
+webapp/img/ico/information-small.png
+webapp/img/ico/information-white.png
+webapp/img/ico/information.png
+webapp/img/ico/jar.png
+webapp/img/ico/magnifier.png
+webapp/img/ico/mail.png
+webapp/img/ico/memory.png
+webapp/img/ico/molecule.png
+webapp/img/ico/network-cloud.png
+webapp/img/ico/network-status-away.png
+webapp/img/ico/network-status-busy.png
+webapp/img/ico/network-status-offline.png
+webapp/img/ico/network-status.png
+webapp/img/ico/network.png
+webapp/img/ico/node-design.png
+webapp/img/ico/node-master.png
+webapp/img/ico/node-select.png
+webapp/img/ico/node-slave.png
+webapp/img/ico/node.png
+webapp/img/ico/pencil-small.png
+webapp/img/ico/plus-button.png
+webapp/img/ico/processor.png
+webapp/img/ico/prohibition.png
+webapp/img/ico/property.png
+webapp/img/ico/question-small-white.png
+webapp/img/ico/question-white.png
+webapp/img/ico/question.png
+webapp/img/ico/receipt-invoice.png
+webapp/img/ico/receipt.png
+webapp/img/ico/script-code.png
+webapp/img/ico/server-cast.png
+webapp/img/ico/server.png
+webapp/img/ico/sitemap.png
+webapp/img/ico/slash.png
+webapp/img/ico/status-away.png
+webapp/img/ico/status-busy.png
+webapp/img/ico/status-offline.png
+webapp/img/ico/status.png
+webapp/img/ico/system-monitor--exclamation.png
+webapp/img/ico/system-monitor.png
+webapp/img/ico/table.png
+webapp/img/ico/terminal.png
+webapp/img/ico/tick-circle.png
+webapp/img/ico/tick-red.png
+webapp/img/ico/tick.png
+webapp/img/ico/toggle-small-expand.png
+webapp/img/ico/toggle-small.png
+webapp/img/ico/toolbox.png
+webapp/img/ico/ui-accordion.png
+webapp/img/ico/ui-address-bar.png
+webapp/img/ico/ui-check-box-uncheck.png
+webapp/img/ico/ui-check-box.png
+webapp/img/ico/ui-radio-button-uncheck.png
+webapp/img/ico/ui-radio-button.png
+webapp/img/ico/ui-text-field-select.png
+webapp/img/ico/users.png
+webapp/img/ico/wooden-box.png
+webapp/img/ico/zone.png
+webapp/img/loader-light.gif
+webapp/img/loader.gif
+webapp/img/lucene-ico.png
+webapp/img/solr-ico.png
+webapp/img/solr.png
+webapp/img/tree.png
 webapp/js
 webapp/js/lib
+webapp/js/lib/ZeroClipboard.js
+webapp/js/lib/chosen.js
+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.blockUI.js
+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
+webapp/js/main.js
+webapp/js/require.js
 webapp/js/scripts
+webapp/js/scripts/analysis.js
+webapp/js/scripts/app.js
+webapp/js/scripts/cloud.js
+webapp/js/scripts/cores.js
+webapp/js/scripts/dashboard.js
+webapp/js/scripts/dataimport.js
+webapp/js/scripts/file.js
+webapp/js/scripts/index.js
+webapp/js/scripts/java-properties.js
+webapp/js/scripts/logging.js
+webapp/js/scripts/ping.js
+webapp/js/scripts/plugins.js
+webapp/js/scripts/query.js
+webapp/js/scripts/replication.js
+webapp/js/scripts/schema-browser.js
+webapp/js/scripts/threads.js
 webapp/tpl
+webapp/tpl/analysis.html
+webapp/tpl/cloud.html
+webapp/tpl/cores.html
+webapp/tpl/dashboard.html
+webapp/tpl/dataimport.html
+webapp/tpl/index.html
+webapp/tpl/logging.html
+webapp/tpl/plugins.html
+webapp/tpl/query.html
+webapp/tpl/replication.html
+webapp/tpl/schema-browser.html
+webapp/tpl/threads.html
+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-3.6.2.jar
-lib/rjack-solr/solr-solrj-3.6.2.jar
+lib/rjack-solr/solr-core-4.0.0.jar
+lib/rjack-solr/solr-solrj-4.0.0.jar

data/NOTICE.txt

@@ -1,5 +1,5 @@
 rjack-solr gem
-Copyright (c) 2012 David Kellum
+Copyright (c) 2012-2013 David Kellum
 
 This product includes software developed by:
 

data/README.rdoc

@@ -10,15 +10,15 @@ A gem packaging of {Solr}[http://lucene.apache.org/solr].
 
 == Synopsis
 
-Solr is run as a service on Jetty 7.x, and defaults to finding its
-conf/ and data/ directories under the current working directory. To
-get started, you can use the SOLR release's sample config:
+Solr is run as a service, and defaults to finding its conf/ and data/
+directories under ./collection1. To get started, you can use the SOLR
+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_3_6_1/solr/example/solr/conf
+  % svn checkout http://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_4_0_0/solr/example/solr/collection1
 
-  # Edit conf/schema.xml and remove/comment out the text_ja fieldType
+  # Edit collection1/conf/schema.xml and remove/comment out the text_ja fieldType
   # The Kuromoji Japanese Morphological is not included in
   # rjack-lucene, due to size.
 
@@ -40,7 +40,7 @@ And pass <code>rjack-solr-fg -c ./config.rb</code>
 
 === rjack-solr gem
 
-Copyright (c) 2012 David Kellum
+Copyright (c) 2012-2013 David Kellum
 
 Licensed under the Apache License, Version 2.0 (the "License"); you
 may not use this file except in compliance with the License.  You

data/assembly.xml

@@ -9,11 +9,11 @@
       <useProjectArtifact>false</useProjectArtifact>
       <excludes>
         <exclude>commons-codec:commons-codec</exclude>
-        <exclude>jakarta-regexp:*</exclude>
         <exclude>org.apache.lucene:*</exclude>
         <exclude>org.apache.solr:solr</exclude>
         <exclude>org.slf4j:*</exclude>
-        <exclude>javax.servlet:servlet-api</exclude>
+        <exclude>org.apache.zookeeper:*</exclude>
+        <exclude>com.google.guava:*</exclude>
       </excludes>
     </dependencySet>
   </dependencySets>

data/bin/rjack-solr-fg

@@ -1,7 +1,7 @@
 #!/usr/bin/env jruby
 # -*- ruby -*-
 #--
-# Copyright (c) 2012 David Kellum
+# Copyright (c) 2012-2013 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You

data/init/rjack-solr

@@ -7,7 +7,7 @@
 #. hashdot.vm.options += -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled
 
 #--
-# Copyright (c) 2012 David Kellum
+# Copyright (c) 2012-2013 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -23,7 +23,7 @@
 #++
 
 require 'rubygems'
-gem( "rjack-solr", "= 3.6.2.0" )
+gem( "rjack-solr", "= 4.0.0.0" )
 
 module BinScript
 

data/lib/rjack-solr.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2012 David Kellum
+# Copyright (c) 2012-2013 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -17,7 +17,12 @@
 require 'rjack-commons-codec'
 require 'rjack-lucene'
 require 'rjack-jetty'
-require 'rjack-httpclient-3'
+require 'rjack-httpclient-4'
+
+require 'rjack-slf4j'
+require 'rjack-slf4j/log4j-over-slf4j'
+require 'rjack-zookeeper'
+require 'rjack-guava'
 
 require 'rjack-solr/base'
 

data/lib/rjack-solr/base.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2012 David Kellum
+# Copyright (c) 2012-2013 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -18,7 +18,7 @@ module RJack
   module Solr
 
     # SOLR (java) version
-    CORE_VERSION = '3.6.2'
+    CORE_VERSION = '4.0.0'
 
     # rjack gem version
     VERSION = CORE_VERSION + '.0'