flare 0.0.1 → 1.0.0

data/Rakefile

@@ -5,7 +5,6 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "flare"
-    gem.executables= 'flare-solr'
     gem.summary = 'This needs to get updated'
     gem.description = 'This needs to get updated'
     gem.email = "mpdwan@gmail.com"

data/VERSION

@@ -1 +1 @@
-0.0.1
+1.0.0

data/flare.gemspec

@@ -5,15 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{flare}
-  s.version = "0.0.1"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Dwan"]
-  s.date = %q{2009-11-03}
-  s.default_executable = %q{flare-solr}
+  s.date = %q{2009-12-29}
   s.description = %q{This needs to get updated}
   s.email = %q{mpdwan@gmail.com}
-  s.executables = ["flare-solr"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -25,7 +23,6 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
-     "bin/flare-solr",
      "flare.gemspec",
      "lib/flare.rb",
      "lib/flare/active_record.rb",
@@ -34,28 +31,6 @@ Gem::Specification.new do |s|
      "lib/flare/index_builder.rb",
      "lib/flare/session.rb",
      "lib/flare/tasks.rb",
-     "solr/etc/jetty.xml",
-     "solr/etc/webdefault.xml",
-     "solr/lib/jetty-6.1.3.jar",
-     "solr/lib/jetty-util-6.1.3.jar",
-     "solr/lib/jsp-2.1/ant-1.6.5.jar",
-     "solr/lib/jsp-2.1/core-3.1.1.jar",
-     "solr/lib/jsp-2.1/jsp-2.1.jar",
-     "solr/lib/jsp-2.1/jsp-api-2.1.jar",
-     "solr/lib/servlet-api-2.5-6.1.3.jar",
-     "solr/solr/conf/elevate.xml",
-     "solr/solr/conf/protwords.txt",
-     "solr/solr/conf/schema.xml",
-     "solr/solr/conf/solrconfig.xml",
-     "solr/solr/conf/stopwords.txt",
-     "solr/solr/conf/synonyms.txt",
-     "solr/solr/lib/geoapi-nogenerics-2.1-M2.jar",
-     "solr/solr/lib/gt2-referencing-2.3.1.jar",
-     "solr/solr/lib/jsr108-0.01.jar",
-     "solr/solr/lib/locallucene.jar",
-     "solr/solr/lib/localsolr.jar",
-     "solr/start.jar",
-     "solr/webapps/solr.war",
      "test/helper.rb",
      "test/test_flare.rb"
   ]

data/lib/flare/tasks.rb

@@ -1,51 +1,6 @@
 require 'escape'
 
 namespace :flare do
-  namespace :solr do
-    desc 'Start the Solr instance'
-    task :start => :environment do
-      solr_home = Flare::Configuration.server.solr_home
-      data_dir = Flare::Configuration.server.data_dir
-      pid_dir = Flare::Configuration.server.pid_dir
-      port = Flare::Configuration.server.port 
-      log_file = File.join(Flare::Configuration.server.log_dir, 'solr.log')
-      log_level = Flare::Configuration.server.log_level
-      script_file = File.dirname(__FILE__) + '/../../bin/flare-solr'
-
-      [data_dir, pid_dir].each { |path| FileUtils.mkdir_p(path) }
-      
-      command = [script_file, 'start', '-p', port.to_s, '-d', data_dir, '--pid-dir', pid_dir, '-l', log_level, '--log-file', log_file]
-      if solr_home
-        command << '-s' << solr_home
-      end
-      system(Escape.shell_command(command))
-    end
-
-    desc 'Run the Solr instance in the foreground'
-    task :run => :environment do
-      data_path = Flare::Configuration.server.data_dir
-      solr_home = Flare::Configuration.server.solr_home
-      port = Flare::Configuration.server.port
-      script_file = File.dirname(__FILE__) + '/../../bin/flare-solr'
-
-      FileUtils.mkdir_p(data_path)
-      command = [script_file, 'run', '-p', port.to_s, '-d', data_path]
-      if solr_home
-        command << '-s' << solr_home
-      end
-      exec(Escape.shell_command(command))
-    end
-
-    desc 'Stop the Solr instance'
-    task :stop => :environment do
-      script_file = File.dirname(__FILE__) + '/../../bin/flare-solr'
-
-      FileUtils.cd(Flare::Configuration.server.pid_dir) do
-        system(Escape.shell_command([script_file, 'stop']))
-      end
-    end
-  end
-    
   desc 'Rebuild the Solr index for all searchable models'
   task :rebuild_index => :environment do      
     Flare.indexed_models.each do |model|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: flare
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 1.0.0
 platform: ruby
 authors: 
 - Michael Dwan
@@ -9,8 +9,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-07 00:00:00 -06:00
-default_executable: flare-solr
+date: 2009-12-29 00:00:00 -06:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rsolr
@@ -44,8 +44,8 @@ dependencies:
     version: 
 description: This needs to get updated
 email: mpdwan@gmail.com
-executables: 
-- flare-solr
+executables: []
+
 extensions: []
 
 extra_rdoc_files: 
@@ -58,7 +58,6 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- bin/flare-solr
 - flare.gemspec
 - lib/flare.rb
 - lib/flare/active_record.rb
@@ -67,28 +66,6 @@ files:
 - lib/flare/index_builder.rb
 - lib/flare/session.rb
 - lib/flare/tasks.rb
-- solr/etc/jetty.xml
-- solr/etc/webdefault.xml
-- solr/lib/jetty-6.1.3.jar
-- solr/lib/jetty-util-6.1.3.jar
-- solr/lib/jsp-2.1/ant-1.6.5.jar
-- solr/lib/jsp-2.1/core-3.1.1.jar
-- solr/lib/jsp-2.1/jsp-2.1.jar
-- solr/lib/jsp-2.1/jsp-api-2.1.jar
-- solr/lib/servlet-api-2.5-6.1.3.jar
-- solr/solr/conf/elevate.xml
-- solr/solr/conf/protwords.txt
-- solr/solr/conf/schema.xml
-- solr/solr/conf/solrconfig.xml
-- solr/solr/conf/stopwords.txt
-- solr/solr/conf/synonyms.txt
-- solr/solr/lib/geoapi-nogenerics-2.1-M2.jar
-- solr/solr/lib/gt2-referencing-2.3.1.jar
-- solr/solr/lib/jsr108-0.01.jar
-- solr/solr/lib/locallucene.jar
-- solr/solr/lib/localsolr.jar
-- solr/start.jar
-- solr/webapps/solr.war
 - test/helper.rb
 - test/test_flare.rb
 has_rdoc: true

data/bin/flare-solr

@@ -1,83 +0,0 @@
-#!/usr/bin/env ruby
-using_gems = false
-begin
-  require 'fileutils'
-  require 'tempfile'
-  require 'tmpdir'
-  require 'optparse'
-  require 'daemons'
-rescue LoadError => e
-  if using_gems
-    raise(e)
-  else
-    using_gems = true
-    require 'rubygems'
-    retry
-  end
-end
-
-working_directory = FileUtils.pwd
-solr_install = File.expand_path(File.join(File.dirname(__FILE__), '..', 'solr'))
-
-port      = '8983'
-data_dir  = File.expand_path(File.join(Dir.tmpdir, 'solr_data'))
-solr_home = File.join(solr_install, 'solr')
-pid_dir   = working_directory
-log_file  = nil
-log_level = 'OFF'
-
-OptionParser.new do |opts|
-  opts.banner = "Usage: flare-solr start [options]"
-
-  opts.on '-p', '--port=PORT', 'Port on which to run Solr (default 8983)' do |p|
-    port = p
-  end
-
-  opts.on '-d', '--data-directory=DIRECTORY', 'Solr data directory' do |d|
-    data_dir = File.expand_path(d)
-  end
-
-  opts.on '-s', '--solr-home=HOME', 'Solr home directory (should contain conf/ directory)' do |s|
-    solr_home = File.expand_path(s)
-  end
-
-  opts.on '--pid-dir=PID_DIR', 'Directory for pid files' do |pd|
-    pid_dir = File.expand_path(pd)
-  end
-
-  opts.on '-l', '--log-level=LOG_LEVEL', 'Solr logging level' do |l|
-    log_level = l
-  end
-
-  opts.on '--log-file=LOG_FILE', 'Path to Solr log file' do |lf|
-    log_file = File.expand_path(lf)
-  end
-end.parse!
-
-options = { :dir_mode => :normal, :dir => pid_dir }
-
-def logging_properties( log_file, log_level )
-  temp_file = Tempfile.new 'logging.properties'
-  temp_file << <<PROPERTIES
-.level = #{log_level}
-handlers = java.util.logging.FileHandler
-java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter
-java.util.logging.FileHandler.pattern   = #{log_file}
-PROPERTIES
-  temp_file.flush
-  temp_file.close
-  temp_file.path
-end
-
-Daemons.run_proc('flare-solr', options) do
-  FileUtils.cd(solr_install) do
-    args = ['java']
-    args << "-Djetty.port=#{port}" if port
-    args << "-Dsolr.data.dir=#{data_dir}" if data_dir
-    args << "-Dsolr.solr.home=#{solr_home}" if solr_home
-    args << "-Djava.util.logging.config.file=#{logging_properties(log_file, log_level)}" if log_file and log_level != 'OFF'
-    args << '-jar' << File.join(solr_install, 'start.jar')
-    STDERR.puts(args * ' ')
-    Kernel.exec(*args)
-  end
-end

data/solr/etc/jetty.xml

@@ -1,212 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
-
-<!-- =============================================================== -->
-<!-- Configure the Jetty Server                                      -->
-<!--                                                                 -->
-<!-- Documentation of this file format can be found at:              -->
-<!-- http://docs.codehaus.org/display/JETTY/jetty.xml                -->
-<!--                                                                 -->
-<!-- =============================================================== -->
-
-
-<Configure id="Server" class="org.mortbay.jetty.Server">
-
-    <!-- Increase the maximum POST size to 1 MB to be able to handle large shard requests -->
-    <Call class="java.lang.System" name="setProperty">
-      <Arg>org.mortbay.jetty.Request.maxFormContentSize</Arg>
-      <Arg>1000000</Arg>
-    </Call>
-
-    <!-- =========================================================== -->
-    <!-- Server Thread Pool                                          -->
-    <!-- =========================================================== -->
-    <Set name="ThreadPool">
-      <!-- Default bounded blocking threadpool 
-      -->
-      <New class="org.mortbay.thread.BoundedThreadPool">
-        <Set name="minThreads">10</Set>
-        <Set name="lowThreads">50</Set>
-        <Set name="maxThreads">10000</Set>
-      </New>
-
-      <!-- Optional Java 5 bounded threadpool with job queue 
-      <New class="org.mortbay.thread.concurrent.ThreadPool">
-        <Arg type="int">0</Arg>
-        <Set name="corePoolSize">10</Set>
-        <Set name="maximumPoolSize">250</Set>
-      </New>
-      -->
-    </Set>
-
-
-
-    <!-- =========================================================== -->
-    <!-- Set connectors                                              -->
-    <!-- =========================================================== -->
-    <!-- One of each type!                                           -->
-    <!-- =========================================================== -->
-
-    <!-- Use this connector for many frequently idle connections
-         and for threadless continuations.
-    <Call name="addConnector">
-      <Arg>
-          <New class="org.mortbay.jetty.nio.SelectChannelConnector">
-            <Set name="port"><SystemProperty name="jetty.port" default="8983"/></Set>
-            <Set name="maxIdleTime">30000</Set>
-            <Set name="Acceptors">2</Set>
-            <Set name="confidentialPort">8443</Set>
-          </New>
-      </Arg>
-    </Call>
-   -->     
-
-    <!-- Use this connector if NIO is not available. -->
-    <!-- This connector is currently being used for Solr because the
-         nio.SelectChannelConnector showed poor performance under WindowsXP
-         from a single client with non-persistent connections (35s vs ~3min)
-         to complete 10,000 requests)
-    -->
-    <Call name="addConnector">
-      <Arg>
-          <New class="org.mortbay.jetty.bio.SocketConnector">
-            <Set name="port"><SystemProperty name="jetty.port" default="8983"/></Set>
-            <Set name="maxIdleTime">50000</Set>
-            <Set name="lowResourceMaxIdleTime">1500</Set>
-          </New>
-      </Arg>
-    </Call>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <!-- To add a HTTPS SSL listener                                     -->
-    <!-- see jetty-ssl.xml to add an ssl connector. use                  -->
-    <!-- java -jar start.jar etc/jetty.xml etc/jetty-ssl.xml             -->
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    
-    <!-- =========================================================== -->
-    <!-- Set up global session ID manager                            -->
-    <!-- =========================================================== -->
-    <!--
-    <Set name="sessionIdManager">
-      <New class="org.mortbay.jetty.servlet.HashSessionIdManager">
-        <Set name="workerName">node1</Set>
-      </New>
-    </Set>
-    -->
-
-    <!-- =========================================================== -->
-    <!-- Set handler Collection Structure                            --> 
-    <!-- =========================================================== -->
-    <Set name="handler">
-      <New id="Handlers" class="org.mortbay.jetty.handler.HandlerCollection">
-        <Set name="handlers">
-         <Array type="org.mortbay.jetty.Handler">
-           <Item>
-             <New id="Contexts" class="org.mortbay.jetty.handler.ContextHandlerCollection"/>
-           </Item>
-           <Item>
-             <New id="DefaultHandler" class="org.mortbay.jetty.handler.DefaultHandler"/>
-           </Item>
-           <Item>
-             <New id="RequestLog" class="org.mortbay.jetty.handler.RequestLogHandler"/>
-           </Item>
-         </Array>
-        </Set>
-      </New>
-    </Set>
-    
-    <!-- =========================================================== -->
-    <!-- Configure the context deployer                              -->
-    <!-- A context deployer will deploy contexts described in        -->
-    <!-- configuration files discovered in a directory.              -->
-    <!-- The configuration directory can be scanned for hot          -->
-    <!-- deployments at the configured scanInterval.                 -->
-    <!--                                                             -->
-    <!-- This deployer is configured to deploy contexts configured   -->
-    <!-- in the $JETTY_HOME/contexts directory                       -->
-    <!--                                                             -->
-    <!-- =========================================================== -->
-    <Call name="addLifeCycle">
-      <Arg>
-        <New class="org.mortbay.jetty.deployer.ContextDeployer">
-          <Set name="contexts"><Ref id="Contexts"/></Set>
-          <Set name="configurationDir"><SystemProperty name="jetty.home" default="."/>/contexts</Set>
-          <Set name="scanInterval">1</Set>
-        </New>
-      </Arg>
-    </Call>
-
-    <!-- =========================================================== -->
-    <!-- Configure the webapp deployer.                              -->
-    <!-- A webapp  deployer will deploy standard webapps discovered  -->
-    <!-- in a directory at startup, without the need for additional  -->
-    <!-- configuration files.    It does not support hot deploy or   -->
-    <!-- non standard contexts (see ContextDeployer above).          -->
-    <!--                                                             -->
-    <!-- This deployer is configured to deploy webapps from the      -->
-    <!-- $JETTY_HOME/webapps directory                               -->
-    <!--                                                             -->
-    <!-- Normally only one type of deployer need be used.            -->
-    <!--                                                             -->
-    <!-- =========================================================== -->
-    <Call name="addLifeCycle">
-      <Arg>
-        <New class="org.mortbay.jetty.deployer.WebAppDeployer">
-          <Set name="contexts"><Ref id="Contexts"/></Set>
-          <Set name="webAppDir"><SystemProperty name="jetty.home" default="."/>/webapps</Set>
-				  <Set name="parentLoaderPriority">false</Set>
-				  <Set name="extract">true</Set>
-				  <Set name="allowDuplicates">false</Set>
-          <Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="."/>/etc/webdefault.xml</Set>
-        </New>
-      </Arg>
-    </Call>
-
-    <!-- =========================================================== -->
-    <!-- Configure Authentication Realms                             -->
-    <!-- Realms may be configured for the entire server here, or     -->
-    <!-- they can be configured for a specific web app in a context  -->
-    <!-- configuration (see $(jetty.home)/contexts/test.xml for an   -->
-    <!-- example).                                                   -->
-    <!-- =========================================================== -->
-    <Set name="UserRealms">
-      <Array type="org.mortbay.jetty.security.UserRealm">
-        <!--
-        <Item>
-          <New class="org.mortbay.jetty.security.HashUserRealm">
-            <Set name="name">Test Realm</Set>
-            <Set name="config"><SystemProperty name="jetty.home" default="."/>/etc/realm.properties</Set>
-          </New>
-        </Item>
-	-->
-      </Array>
-    </Set>
-
-    <!-- =========================================================== -->
-    <!-- Configure Request Log                                       -->
-    <!-- Request logs  may be configured for the entire server here, -->
-    <!-- or they can be configured for a specific web app in a       -->
-    <!-- contexts configuration (see $(jetty.home)/contexts/test.xml -->
-    <!-- for an example).                                            -->
-    <!-- =========================================================== -->
-    <Ref id="RequestLog">
-      <Set name="requestLog">
-        <!-- New id="RequestLogImpl" class="org.mortbay.jetty.NCSARequestLog">
-          <Arg><SystemProperty name="jetty.logs" default="./logs"/>/yyyy_mm_dd.request.log</Arg>
-          <Set name="retainDays">90</Set>
-          <Set name="append">true</Set>
-          <Set name="extended">false</Set>
-          <Set name="LogTimeZone">GMT</Set>
-        </New -->
-      </Set>
-    </Ref>
-
-    <!-- =========================================================== -->
-    <!-- extra options                                               -->
-    <!-- =========================================================== -->
-    <Set name="stopAtShutdown">true</Set>
-    <!-- ensure/prevent Server: header being sent to browsers        -->
-    <Set name="sendServerVersion">true</Set>
-
-</Configure>
-