Fix announcement versioning

Conflicts:

	Gemfile

.gitignore

@@ -11,7 +11,7 @@ public/assets
 public/index.html
 public/panel/**/*
 public/uploads/**/*
-solr/data
+solr
 tmp/**/*
 uploads/**/*
 
@@ -20,4 +20,4 @@ uploads/**/*
 *.lck
 
 .sass-cache/*
-*.supported
+*.supported

Gemfile

@@ -65,6 +65,7 @@ gem 'redis-namespace'
 gem 'redis-search'
 gem 'syslog-logger'
 gem "recaptcha", :require => "recaptcha/rails"
+gem 'mongoid-versioning'
 
 # Gems used only for assets and not required
 # in production environments by default.

app/assets/stylesheets/ask.css

@@ -1,40 +0,0 @@
-#acknowledgement {
-  display: none;
-  padding: 20px;
-  margin: -20px 0 30px 0;
-  background-color: #fff;
-  font-weight: bold;
-  font-size: 15px;
-  border: solid 2px #f0f0f0;
-}
-#aclnowledgement:after {
-  content: '';
-  display: table;
-  width: table;
-  clear: both;
-}
-
-.ask-question {
-
-}
-
-/* AQ form */
-#new-ask-question {
-  background-color: #f8f8f8;
-  padding: 20px 0;
-}
-#new-ask-question .form-horizontal .control-label {
-  width: 100px;
-}
-#new-ask-question .form-horizontal .controls {
-  margin-left: 120px;
-}
-#new-ask-question .form-horizontal .controls textarea {
-  width: 80%;
-  resize: vertical;
-}
-#new-ask-question .form-horizontal .form-actions {
-  padding-left: 120px;
-  background-color: transparent;
-  border: none;
-}

app/controllers/admin/mail_cron_logs_controller.rb

@@ -1,31 +0,0 @@
-class Admin::MailCronLogsController <  OrbitBackendController
-  
-  layout "new_admin"
-  before_filter :authenticate_user!
-  before_filter :is_admin?
-
-  def index  
-
-    @mail_cron_logs = MailCronLog.all.desc(:created_at).page(params[:page_main] ).per('20')
-
-  end 
-  
-  def destroy 
-    @mail_cron_log = MailCronLog.find(params[:id])
-    @mail_cron_log.destroy
-
-    respond_to do |format|
-      format.html { redirect_to(admin_mail_cron_logs_url) }
-      # format.xml  { head :ok }
-      format.js
-    end
-  end 
-
-  def delete
-    if params[:ids]
-      mail_cron_logs = MailCronLog.any_in(:_id => params[:ids]).destroy_all
-    end
-    redirect_to admin_mail_cron_logs_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
-  end
-  
-end

app/controllers/admin/mail_crons_controller.rb

@@ -1,119 +0,0 @@
-class Admin::MailCronsController <  OrbitBackendController
-  
-  layout "new_admin"
-  before_filter :authenticate_user!
-  before_filter :is_admin?
-
-  def index  
-
-    @mail_logs = MailCron.all.asc(:mail_sentdate).page(params[:page_main] ).per('20')
-
-  end
-  
-  def show  
-  end
-  
-  def new 
-    @mail_cron = MailCron.new 
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.xml  { render :xml => @mail_cron }
-    end
-  end
-  
-  def create 
-    @mail_cron = MailCron.new(params[:mail_cron])
-
-    @mail_cron.create_user_id = current_user.id
-    @mail_cron.update_user_id = current_user.id
-
-    respond_to do |format|
-      if @mail_cron.save
-        format.html { redirect_to(admin_mail_crons_url) }
-        format.xml  { render :xml => @mail_cron, :status => :created, :location => @mail_cron }
-      else
-        format.html { render :action => "new" }
-        format.xml  { render :xml => @mail_cron.errors, :status => :unprocessable_entity }
-      end
-    end
-  end 
-
-  def edit 
-    @mail_cron = MailCron.find(params[:id])
-  end 
-  
-  def update   
-
-
-
-    @datas = MailCron.where(:mail_sentdate.lte => Time.now, :mail_sent => false)
-
-    @datas.each do |mail_data| 
-
-      @mail_j = 0
-      @read_mails = Array.new 
-
-      @mails = mail_data.mail_to.split(",")
-
-      @mails.each do |send_mail|
-
-        @read_mails << send_mail
-
-        @mail_j += 1 
-
-        if  0 == @mail_j % 30 
-          MailCronMailer.cron_mail( mail_data.id, @read_mails.join(',') ).deliver
-          @read_mails = Array.new
-
-          sleep 10
-        end
-
-      end
-
-      if !@read_mails.join(',').blank?
-        MailCronMailer.cron_mail( mail_data.id, @read_mails.join(',') ).deliver
-        @read_mails = Array.new
-
-        sleep 10
-      end  
-
-    end
-    
-    @mail_cron = MailCron.find(params[:id])
-  
-    @mail_cron.update_user_id = current_user.id 
-
-    respond_to do |format|
-      if @mail_cron.update_attributes(params[:mail_cron])
-        format.html { redirect_to(admin_mail_crons_url) }
-        format.js  { render 'toggle_enable' }
-        format.xml  { head :ok }
-      else
-        format.html { render :action => "edit" }
-        format.xml  { render :xml => @mail_cron.errors, :status => :unprocessable_entity }
-      end
-    end
-  end
-  
-  def destroy 
-    @mail_cron = MailCron.find(params[:id])
-    @mail_cron.destroy
-
-    respond_to do |format|
-      format.html { redirect_to(admin_mail_crons_url) }
-      # format.xml  { head :ok }
-      format.js
-    end
-  end
-
-  def delete
-    if params[:ids]
-      mail_crons = MailCron.any_in(:_id => params[:ids]).destroy_all
-    end
-    redirect_to admin_mail_crons_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
-  end
-  
-  protected 
-  
-end

app/controllers/admin/user_actions_controller.rb

@@ -1,7 +1,5 @@
 class Admin::UserActionsController < OrbitBackendController
-  layout "new_admin"
-  before_filter :authenticate_user!
-  before_filter :is_admin?
+
   def index
     @user_actions = UserAction.all
   end

app/controllers/default_widget_controller.rb

@@ -20,12 +20,12 @@ class DefaultWidgetController< OrbitWidgetController
       if params["category_id"].blank? #has tag no cate
         result = @ori_class_name.constantize.where(:tagged_ids.in => params["tag_id"])
       else #has tag and cate
-        result = eval("#{@ori_class_name}.where(:#{get_category_field_name}.in=>params['category_id'], :tagged_ids.in => params['tag_id'])")
+        result = eval("#{@ori_class_name}.where(:#{get_category_field_name(@ori_class_name)}.in=>params['category_id'], :tagged_ids.in => params['tag_id'])")
       end
     elsif params["category_id"].blank?  #no tag no cate
       result = eval(@default_widget["query"])
     else #no tag has cate
-      result = eval("#{@ori_class_name}.where(:#{get_category_field_name}.in=>params['category_id'])")
+      result = eval("#{@ori_class_name}.where(:#{get_category_field_name(@ori_class_name)}.in=>params['category_id'])")
     end
     result.available_for_lang(I18n.locale).can_display.desc(:is_top, :postdate)
   end
@@ -90,7 +90,7 @@ class DefaultWidgetController< OrbitWidgetController
     end
   end
   
-  def get_category_field_name
+  def get_category_field_name()
     @ori_class_name = @ori_class_name.constantize
     @ori_class_name.fields.each_key do |key|
       return key if key.include?('category_id')

app/jobs/email_cron.rb

@@ -1,42 +0,0 @@
-class EmailCron
-  @queue = :mail
-
-  def self.perform
-
-    @datas = MailCron.where(:mail_sentdate.lte => Time.now)
-
-    @datas.each do |mail_data| 
-
-      @mail_j = 0
-      @read_mails = Array.new 
-
-      @mails = mail_data.mail_to.split(",")
-
-      @mails.each do |send_mail|
-
-        @read_mails << send_mail
-
-        @mail_j += 1 
-
-        if  0 == @mail_j % 30 
-          MailCronMailer.cron_mail( mail_data.id, @read_mails.join(',') ).deliver
-          @read_mails = Array.new
-
-          sleep 10
-        end
-
-      end
-
-      if !@read_mails.join(',').blank?
-        MailCronMailer.cron_mail( mail_data.id, @read_mails.join(',') ).deliver
-        @read_mails = Array.new
-
-        sleep 10
-      end  
-
-    end
-
-  end
-
-
-end

app/jobs/send_ask_notice_mail.rb

@@ -1,10 +0,0 @@
-class SendAskNoticeMail
-  @queue = :mail
-
-  def self.perform(ask_admin_id, ask_question_id)
-    ask_admin = AskAdmin.find(ask_admin_id)
-    ask_question = AskQuestion.find(ask_question_id)
-    AskMailer.notice(ask_admin, ask_question).deliver
-  end
-
-end

app/jobs/send_ask_reply_mail.rb

@@ -1,9 +0,0 @@
-class SendAskReplyMail
-  @queue = :mail
-
-  def self.perform(ask_question_id)
-    ask_question = AskQuestion.find(ask_question_id)
-    AskMailer.reply(ask_question).deliver
-  end
-
-end

app/mailer/mail_cron_mailer.rb

@@ -1,81 +0,0 @@
-class MailCronMailer < ActionMailer::Base 
-  default :from => "orbit_test@rulingcom.com"
-  
-  def get_settings
-    
-    @site = Site.first
-
-    @smtp_settings = {
-      :address => @site['site_settings']['address'],
-      :port => @site['site_settings']['port'],
-      :domain => @site['site_settings']['domain'],
-      :authentication => @site['site_settings']['authentication'],
-      # :user_name => @site['site_settings']['user_name'],
-      # :password => @site['site_settings']['password'],
-      :tls => (@site['site_settings']['tls'] == '0' ? false : true ) ,
-      :enable_starttls_auto => (@site['site_settings']['enable_starttls_auto'] == '0' ? false : true )
-    }
-
-    if !@site['site_settings']['user_name'].blank? 
-      @smtp_settings[:user_name] = @site['site_settings']['user_name']
-    end
-
-    if !@site['site_settings']['password'].blank? 
-      @smtp_settings[:password] = @site['site_settings']['password']
-    end 
-
-
-    ActionMailer::Base.smtp_settings = @smtp_settings
-
-  end
-
-
-  def cron_mail( data_id, group_mail )
-    
-    get_settings
-
-    @data = MailCron.find(data_id)
-
-    if @data
-
-      @user = User.find(@data.create_user_id)
-      
-      if !@data.mail_cron_files.blank?
-        @data.mail_cron_files.each_with_index do |mail_cron_file, i|
-          file_type = File.extname(mail_cron_file.file.to_s)
-          file_content = Mongo::GridFileSystem.new(Mongoid.database).open(mail_cron_file.file.url.gsub("/gridfs/", "").force_encoding("UTF-8"), 'r')
-          attachments["#{mail_cron_file.title}#{file_type}"] = file_content.read
-        end 
-      end
-
-      if !@data.mail_content["text"].blank?
-        mail( :from => @data.mail_from, :reply_to => @data.mail_reply_to, :bcc => group_mail, :subject => @data.mail_subject ) do |format| 
-          format.html { render :text => @data.mail_content["text"] } 
-        end 
-      elsif !@data.mail_content["template"].blank?
-        mail( :from => @data.mail_from, :reply_to => @data.mail_reply_to, :bcc => group_mail, :subject => @data.mail_subject ) do |format| 
-          format.html { render :template => @data.mail_content["template"], :collection => @data.mail_content  } 
-        end 
-      end 
-
-
-      @mail_cron_log = {  
-        :mail_subject => @data.mail_subject,
-        :mail_to => group_mail,
-        :mail_user => @user.user_id,
-        :mailer_count => group_mail.split(",").size,
-        :mail_from_app => @data.mail_from_app 
-      } 
-
-      @mail_cron_log = MailCronLog.new(@mail_cron_log) 
-
-
-      @mail_cron_log.save
-
-      @data.destroy
-
-    end
-
-  end
-
-end

app/models/mail_cron.rb

@@ -1,32 +0,0 @@
-class MailCron
-  
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  
-
-  field :mail_from_app
-  field :mail_from 
-  field :mail_to  
-  field :mail_reply_to  
-  field :mail_subject
-  field :mail_content, :type => Hash
-  field :mail_sentdate , :type => DateTime
-
-  field :create_user_id
-  field :update_user_id
-  
-  has_many :mail_cron_files, :autosave => true, :dependent => :destroy 
-
-  accepts_nested_attributes_for :mail_cron_files, :allow_destroy => true 
-
-  after_save :save_mail_cron_files
-
-
-  def save_mail_cron_files
-    self.mail_cron_files.each do |t|
-      if t.should_destroy
-        t.destroy
-      end
-    end
-  end
-end

app/models/mail_cron_file.rb

@@ -1,13 +0,0 @@
-class MailCronFile
-
-  include Mongoid::Document
-  include Mongoid::Timestamps
-
-  mount_uploader :file, AssetUploader
-
-  field :should_destroy, :type => Boolean  
-  field :title
-  
-  belongs_to :mail_cron
-
-end

app/models/mail_cron_log.rb

@@ -1,14 +0,0 @@
-class MailCronLog
-  
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  
-
-  field :mail_subject  
-  field :mail_to 
-  field :mail_user 
-  field :mailer_count 
-  field :mail_from_app 
-
-
-end

app/models/mongoid/sortable.rb

@@ -23,7 +23,7 @@ module Mongoid
     def set_sort_number
       if self.new? && self.sort_number.nil?
         last_record = self.class.desc(:sort_number).first
-        if last_record && last_record.sort_number
+        if last_record.sort_number
           self.sort_number = (last_record.sort_number + 10) / 10 * 10
         else
           self.sort_number = 10

app/views/admin/mail_cron_logs/_clear_filters.html.erb

@@ -1,3 +0,0 @@
-<div class="filter-clear">
-	<%= link_to content_tag(:i, nil, :class => 'icons-cycle') + t(:clear), admin_mail_crons_path(:filter => @filter, :sort => params[:sort], :direction => params[:direction], :clear => true, :type => type), :class => "btn btn-small js_history" %>
-</div>

app/views/admin/mail_cron_logs/_filter.html.erb

@@ -1,11 +0,0 @@
-<div id="filter" class="subnav">
-	<div class="filters">
-		<div id="sort_headers" class="table-label">
-			<%= render 'sort_headers' %> 
-		</div>
-	</div>
-</div>
-
-<% content_for :page_specific_javascript do %>
-	<%= javascript_include_tag "sort_header" %>
-<% end %>

app/views/admin/mail_cron_logs/_mail_cron_log.html.erb

@@ -1,29 +0,0 @@
-                <tr id="<%= dom_id mail_cron_log %>" class="with_action">
-                    <td class="span1">
-                        <% if is_manager? %>
-                            <%= check_box_tag 'to_delete[]', mail_cron_log.id, false, :class => "checkbox_in_list" %>
-                        <% end -%>
-                    </td>
-                    <td class="span1-2">
-                        <%= mail_cron_log.mail_subject %>
-                        <div class="quick-edit">
-                            <ul class="nav nav-pills hide">
-                                <%if at_least_module_manager %> 
-                                <li><%= link_to t(:delete_), admin_mail_cron_log_path(mail_cron_log), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
-                                <% end -%>
-                            </ul>
-                        </div>
-                    </td>
-                    <td class="span2">
-                        <%= mail_cron_log.mail_to.gsub(/,/, "<br />").html_safe %> 
-                    </td>
-                    <td class="span2">
-                        <%= mail_cron_log.mail_user %> 
-                    </td>
-                    <td class="span2">
-                        <%= mail_cron_log.mail_from_app %> 
-                    </td>
-                    <td class="span2">
-                        <%= display_date_time(mail_cron_log.created_at) %>
-                    </td>
-                </tr>

app/views/admin/mail_cron_logs/_sort_headers.html.erb

@@ -1,6 +0,0 @@
-<%= render_sort_bar(true, delete_admin_mail_cron_logs_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]),  
-	['subject', 'subject','span2', :subject] ,  
-	['mail_to', 'mail_to','span2', :mail_to] ,  
-	['mail_user', 'mail_user','span2', :mail_user] ,  
-	['mail_from_app', 'mail_from_app','span2', :mail_from_app] ,  
-	['sentdate', 'sentdate','span2', :sentdate] ).html_safe %>

app/views/admin/mail_cron_logs/destroy.js.erb

@@ -1 +0,0 @@
-$("#<%= dom_id @mail_cron_log %>").remove();

app/views/admin/mail_cron_logs/index.html.erb

@@ -1,28 +0,0 @@
-<% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
-<% end %>
-
- <%= render 'filter' %>
-<table class="table main-list">
-  <thead>
-    <tr>
-      <th class="span1"></th>
-      <th class="span2"></th>
-      <th class="span2"></th>
-      <th class="span2"></th>
-      <th class="span2"></th>
-      <th class="span2"></th>
-    </tr>
-  </thead>
-    <tbody id="tbody_mail_cron_logs" class="sort-holder">
-      <%= render :partial => "mail_cron_log",:collection=> @mail_cron_logs%>
-    </tbody>
-  </table>
-
-
-<div class="form-actions form-fixed pagination-right"> 
-  <div id="web_link_pagination" class="paginationFixed">
-  <%= paginate @mail_cron_logs, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
-  </div>
-</div>
-  

app/views/admin/mail_cron_logs/index.js.erb

@@ -1,3 +0,0 @@
-$("#sort_headers").html("<%= j render 'sort_headers' %>");
-$("#tbody_mail_cron_logs").html("<%= j render :partial => 'mail_cron_log', :collection => @mail_cron_logs %>");
-$("#mail_cron_log_pagination").html("<%= j paginate @mail_cron_logs, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>");

app/views/admin/mail_crons/_clear_filters.html.erb

@@ -1,3 +0,0 @@
-<div class="filter-clear">
-	<%= link_to content_tag(:i, nil, :class => 'icons-cycle') + t(:clear), admin_mail_crons_path(:filter => @filter, :sort => params[:sort], :direction => params[:direction], :clear => true, :type => type), :class => "btn btn-small js_history" %>
-</div>

app/views/admin/mail_crons/_filter.html.erb

@@ -1,11 +0,0 @@
-<div id="filter" class="subnav">
-	<div class="filters">
-		<div id="sort_headers" class="table-label">
-			<%= render 'sort_headers' %> 
-		</div>
-	</div>
-</div>
-
-<% content_for :page_specific_javascript do %>
-	<%= javascript_include_tag "sort_header" %>
-<% end %>

app/views/admin/mail_crons/_form.html.erb

@@ -1,122 +0,0 @@
-<div id= "poststuff">
-<% # encoding: utf-8 %>
-
-  <%= f.error_messages %>
-
-	<!--Widget start-->
-	
-	<div id="sub-wiget"> 
-
-		<div id="widget-date" class="widget-box widget-size-300"> 
-			<h3 class="widget-title"><i class="icons-calendar"></i><%= t(:date_) %></h3>
-				<div class="widget-content clear">
-				<div class="control-group">
-					<%= f.datetime_picker :mail_sentdate, :picker_type => 'separated', :label => t(:start) %>
-				</div> 
-			</div>
-		</div>
-  
-	</div>
-  
-  
-<!--Wiget End-->
-<!--Post Start-->
-
-	<div id="post-body">
-		<div id="post-body-content" class="clear">
-		
-			<%= f.label :mail_subject ,t(:mail_subject)%> 
-			<%= f.text_field :mail_subject %>
-		
-			<%= f.label :mail_from ,t(:mail_from)%> 
-			<%= f.text_field :mail_from %>
-		
-			<%= f.label :mail_reply_to ,t(:mail_reply_to)%> 
-			<%= f.text_field :mail_reply_to %>
-		
-			<%= f.label :mail_to ,t(:mail_to)%> 
-			<%= f.text_field :mail_to %> 
-		
-			<%= f.label :mail_content ,t(:mail_content)%> 
-			<%= f.text_area :mail_content, :class=>"span12", :cols=>"25", :rows=>"10" %>
-
-		</div>
-
-
-
-
-
-		<div>
-					
-			<div id='plugin_files' class="plugin_files_block">
-				
-			<table class="table table-condensed">
-				<thead>
-					<tr>
-						<th>File</th>
-						<th>File Name</th>
-						<th class="span1"></th>
-					</tr>
-				</thead>
-				<tfoot>
-					<tr>
-						<td style="text-align:center" colspan="3">
-							<div id='add_plugin_file' class="info_input plugin_files_block">
-								<%= hidden_field_tag 'plugin_file_field_count', @mail_cron.mail_cron_files.count %>
-								<a class="add"><span class="btn btn-primary btn-small"><i class="icon-plus icon-white"></i> ADD/新增</span></a>
-							</div>
-						</td>
-					</tr>
-				
-				</tfoot>
-				<tbody>
-					
-					<% @mail_cron.mail_cron_files.each_with_index do |mail_cron_file, i| %>
-						<%= f.fields_for :mail_cron_files, mail_cron_file do |f| %>
-							<%= render :partial => 'form_file', :object => mail_cron_file, :locals => {:f => f, :i => i} %>
-						<% end %>
-					<% end %>	
-				</tbody>
-			</table>
-			
-			</div>
-			
-		</div>
-
-
-<!--Post End-->
-	</div>
-
-  
-	<div class="form-actions">
-	<%= f.submit t('submit'), :class=>'btn btn-primary' %>
-	<%= link_to t('cancel'), get_go_back, :class=>"btn" %> 
-	</div> 
-
-
-	
-
-<% content_for :page_specific_javascript do %>
-	<%= javascript_include_tag "archive_plugin_form" %>
-	<script>
-		$('#add_plugin_file a.add').live('click', function(){
-			var new_id = $(this).prev().attr('value');
-			var old_id = new RegExp("new_add_plugin_files", "g");
-			$(this).prev().attr('value', parseInt(new_id) + 1);
-			$(this).parents('table').append(("<%= escape_javascript(add_attribute 'form_file', f, :mail_cron_files) %>").replace(old_id, new_id));
-		});
-		
-		$('.add_plugin_files_block a.delete').live('click', function(){
-		  $(this).parents('.list_item').remove();
-		});
-
-		$('.action a.remove_existing_record').live('click', function(){
-		  $(this).next('.should_destroy').attr('value', 1);
-		  $("tr#add_plugin_file_" + $(this).prev().attr('value')).hide();
-		});
-
-	</script>
-<% end %>
-
-
-</div> 

app/views/admin/mail_crons/_form_file.html.erb

@@ -1,35 +0,0 @@
-<% # encoding: utf-8 %>
-
-		<tr id="<%= "plugin_file_#{form_file.id}" if !form_file.new_record? %>" class='list_item'>
-			<td>
-				<div class="control-group">
-					<div class="controls">
-					<%= f.file_field :file %>
-					<%= form_file.file.file ? ( link_to t(:view), form_file.file.url, {:class => 'btn', :target => '_blank', :title => t(:view)} ) : '' %>
-					</div>
-				</div>
-			</td>	
-			<td>	
-			
-				<div class="tab-content">
-
-					<%= f.text_field :title %>
-					
-				</div>
-				
-			</td>
-			
-			<td>
-			<span class="action">
-			<% if form_file.new_record? %>
-			  <a class="delete"><i class="icon-remove"></i></a>
-			<% else %>	
-			  <%= f.hidden_field :id %>
-			  <a class="remove_existing_record"><i class="icon-remove"></i></a>
-			  <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %>
-			<% end %>
-			</span>
-			
-			</td>
-		</tr>
-		

app/views/admin/mail_crons/_mail_cron.html.erb

@@ -1,26 +0,0 @@
-                <tr id="<%= dom_id mail_cron %>" class="with_action">
-                    <td class="span1">
-                        <% if is_manager? %>
-                            <%= check_box_tag 'to_delete[]', mail_cron.id, false, :class => "checkbox_in_list" %>
-                        <% end -%>
-                    </td>
-                    <td class="span1-2">
-                        <%= mail_cron.mail_subject %>
-                        <div class="quick-edit">
-                            <ul class="nav nav-pills hide">
-                                <%if at_least_module_manager %>
-                                <li><%= link_to t(:delete_), admin_mail_cron_path(mail_cron), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
-                                <% end -%>
-                            </ul>
-                        </div>
-                    </td>
-                    <td class="span2">
-                        <%= mail_cron.mail_to.gsub(/,/, "<br />").html_safe %> 
-                    </td>
-                    <td class="span2">
-                        <%= mail_cron.mail_from_app %> 
-                    </td>
-                    <td class="span2">
-                        <%= display_date_time(mail_cron.mail_sentdate) %>
-                    </td>
-                </tr>

app/views/admin/mail_crons/_sort_headers.html.erb

@@ -1,5 +0,0 @@
-<%= render_sort_bar(true, delete_admin_mail_crons_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]),  
-	['subject', 'subject','span2', :subject] ,  
-	['mail_to', 'mail_to','span2', :mail_to] ,  
-	['mail_from_app', 'mail_from_app','span2', :mail_from_app] ,  
-	['sentdate', 'sentdate','span2', :sentdate] ).html_safe %>

app/views/admin/mail_crons/destroy.js.erb

@@ -1 +0,0 @@
-$("#<%= dom_id @mail_cron %>").remove();

app/views/admin/mail_crons/edit.html.erb

@@ -1,9 +0,0 @@
-<% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
-<% end %>
-
-<h1><%= t('mail_cron.editing_mail_cron') %></h1>
-
-<%= form_for @mail_cron, :url => admin_mail_cron_path(@mail_cron), :html => {:class => 'clear'} do |f| %>
-	<%= render :partial => 'form', :locals => {:f => f} %>
-<% end %>

app/views/admin/mail_crons/index.html.erb

@@ -1,28 +0,0 @@
-
-<% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
-<% end %>
-
- <%= render 'filter' %>
-<table class="table main-list">
-  <thead>
-    <tr>
-      <th class="span1"></th>
-      <th class="span2"></th>
-      <th class="span2"></th>
-      <th class="span2"></th>
-      <th class="span2"></th>
-    </tr>
-  </thead>
-    <tbody id="tbody_mail_crons" class="sort-holder">
-      <%= render :partial => "mail_cron",:collection=> @mail_logs%>
-    </tbody>
-  </table>
-
-<div class="form-actions form-fixed pagination-right"> 
-  <div id="web_link_pagination" class="paginationFixed">
-  <%= paginate @mail_logs, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
-  </div>
-</div>
-
-  

app/views/admin/mail_crons/index.js.erb

@@ -1,3 +0,0 @@
-$("#sort_headers").html("<%= j render 'sort_headers' %>");
-$("#tbody_mail_crons").html("<%= j render :partial => 'mail_cron', :collection => @mail_crons %>");
-$("#mail_cron_pagination").html("<%= j paginate @mail_crons, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>");

app/views/admin/mail_crons/new.html.erb

@@ -1,12 +0,0 @@
-
-<% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
-<% end %>
-
-<div id="poststuff">
-<h1><%= t('mail_cron.new_mail_cron') %></h1>
-<%= form_for @mail_cron, :url => admin_mail_crons_path, :html => {:class => 'clear'} do |f| %>
-	<%= render :partial => 'form', :locals => {:f => f} %>
-<% end %>
-</div> 
-

app/views/admin/sites/_side_bar.html.erb

@@ -8,9 +8,6 @@
 		<%= content_tag :li, link_to(t('mail.setting'), admin_site_mail_setting_path(@site)), :class => active_for_action('sites', 'mail_setting') %>
 		<%#= content_tag :li, link_to(t(:theme), admin_site_ui_theme_path(@site)), :class => active_for_action('sites', 'ui_theme') %>
 		<%= content_tag :li, link_to(t('sitemap'), admin_site_sitemap_path(@site)), :class => active_for_action('sites', 'sitemap') %>
-		<%= content_tag :li, link_to(t('user_actions'), admin_user_actions_path), :class => active_for_action('user_actions', 'index') %>
-		<%= content_tag :li, link_to(t('mail.mail_cron'), admin_mail_crons_path), :class => active_for_action('mail_cron', 'index') %>
-		<%= content_tag :li, link_to(t('mail.mail_cron_log'), admin_mail_cron_logs_path), :class => active_for_action('mail_cron_log', 'index') %>
 	<% end -%>
 
 <% end -%>

app/views/admin/tags/_tag.html.erb

@@ -8,6 +8,6 @@
 	</div>
 	<div class="action">
 	<%= link_to t(:edit), edit_admin_tag_path(tag, :module_app_id => @module_app_id), :remote => true  %>
-	<%= link_to t(:delete_), admin_tag_path(tag, :module_app_id => @module_app_id), :confirm => t('sure?'), :method => :delete, :remote => true  %>
+	<%= link_to t(:delete_), admin_tag_path(tag), :confirm => t('sure?'), :method => :delete, :remote => true  %>
 	</div>
 </div>

app/views/admin/user_actions/index.html.erb

@@ -1,7 +1,3 @@
-<% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
-<% end %>
-
 <table class="table">
   <tr>
     <th><%= I18n.t 'user_action.time' %></th>

config/environments/development.rb

@@ -21,7 +21,7 @@ Orbit::Application.configure do
   config.active_support.deprecation = :log
 
   # Only use best-standards-support built into browsers
-  config.action_dispatch.best_standards_support = :builtin
+  config.action_dispatch.best_standards_support = :builtin  
 
   # config.cache_store = :mem_cache_store
 
@@ -33,16 +33,17 @@ Orbit::Application.configure do
   #   :email_prefix => "[R4_error]",
   #   :sender_address => %{"notifier" <redmine@rulingcom.com>},
   #   :exception_recipients => %w{chris@rulingcom.com}
-
-  config.action_mailer.delivery_method = :smtp
-  config.action_mailer.smtp_settings = {
-    :enable_starttls_auto => true,
-    :address => "smtp.gmail.com",
-    :port => '587',
-    :domain => "smtp.gmail.com",
-    :authentication => "plain",
-    :user_name => "redmine@rulingcom.com",
-    :password => "rulingredmine" }
-
+    
+  # config.action_mailer.delivery_method = :smtp
+  # config.action_mailer.smtp_settings = {
+  #   :tls => true,
+  #   :enable_starttls_auto => true,
+  #   :address => "smtp.gmail.com",
+  #   :port => '587',
+  #   :domain => "smtp.gmail.com",
+  #   :authentication => "plain",
+  #   :user_name => "redmine@rulingcom.com",
+  #   :password => "rulingredmine" }
+    
 end
 

config/environments/production.rb

@@ -19,6 +19,7 @@ Orbit::Application.configure do
 
   # Generate digests for assets URLs
   config.assets.digest = true
+  config.logger = Logger::Syslog.new
 
   # Defaults to Rails.root.join("public/assets")
   # config.assets.manifest = YOUR_PATH
@@ -63,9 +64,9 @@ Orbit::Application.configure do
   config.action_mailer.delivery_method = :smtp
   config.action_mailer.smtp_settings = {
     :enable_starttls_auto => true,
-    :address => "http://smtp.gmail.com",
+    :address => "smtp.gmail.com",
     :port => '587',
-    :domain => "http://smtp.gmail.com",
+    :domain => "smtp.gmail.com",
     :authentication => "plain",
     :user_name => "redmine@rulingcom.com",
     :password => "rulingredmine"

config/locales/en.yml

@@ -272,8 +272,6 @@ en:
     setting: Mail settings
     tls: TLS
     user_name: User Name
-    mail_cron: Scheduled Email
-    mail_cron_log: Email Log
   manager: Manager
   markup: Markup
   markup_options: Markup options
@@ -467,7 +465,6 @@ en:
   url: URL
   use_status: Use Statue
   user: User
-  user_actions: User log
   user_action:
     time: Time
     name: Account

config/locales/zh_tw.yml

@@ -272,8 +272,6 @@ zh_tw:
     setting: 電子郵件設定
     tls: 電子郵件TLS
     user_name: 電子郵件帳號
-    mail_cron: 待寄Email
-    mail_cron_log: Email發送記錄
   manager: 管理者
   markup: 輸入模式
   markup_options: 標註選項
@@ -468,7 +466,6 @@ zh_tw:
   url: 網址
   use_status: 使用狀態
   user: 使用者
-  user_actions: 使用者Log
   user_action:
     time: 時間
     name: 使用帳號

config/resque_schedule.yml

@@ -8,10 +8,4 @@ generate_system_summary:
   cron: 0 0 12 * * *
   class: GenerateSystemSummary
   args:
-  description: Generate the system status such as disk free space,package version list for showing at site tab
-
- email_cron:
-  cron: 0 0 [10,16,22] * * *
-  class: EmailCron
-  args:
-  description: EmailCron
+  description: Generate the system status such as disk free space,package version list for showing at site tab

config/routes.rb

@@ -29,19 +29,6 @@ Orbit::Application.routes.draw do
         get 'delete'
       end
     end
-
-    resources :mail_crons do   
-      collection do
-        get 'delete'
-      end
-    end
-
-    resources :mail_cron_logs do   
-      collection do
-        get 'delete'
-      end
-    end
-
     resources :asset_categories
     resources :asset_tags
     resources :app_auths 

lib/tasks/resque.rake

@@ -15,7 +15,7 @@ namespace :resque do
     require 'resque/scheduler'
 
     # you probably already have this somewhere
-    # Resque.redis = 'localhost:6379'
+    Resque.redis = 'localhost:6379'
 
     # If you want to be able to dynamically change the schedule,
     # uncomment this line.  A dynamic schedule can be updated via the

solr/conf/admin-extra.html

@@ -1,31 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- The content of this page will be statically included into the top
-of the admin page.  Uncomment this as an example to see there the content
-will show up.
-
-<hr>
-<i>This line will appear before the first table</i>
-<tr>
-<td colspan="2">
-This row will be appended to the end of the first table
-</td>
-</tr>
-<hr>
-
--->

solr/conf/elevate.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- If this file is found in the config directory, it will only be
-     loaded once at startup.  If it is found in Solr's data
-     directory, it will be re-loaded every commit.
--->
-
-<elevate>
- <query text="foo bar">
-  <doc id="1" />
-  <doc id="2" />
-  <doc id="3" />
- </query>
- 
- <query text="ipod">
-   <doc id="MA147LL/A" />  <!-- put the actual ipod at the top -->
-   <doc id="IW-02" exclude="true" /> <!-- exclude this cable -->
- </query>
- 
-</elevate>

solr/conf/mapping-ISOLatin1Accent.txt

@@ -1,246 +0,0 @@
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Syntax:
-#   "source" => "target"
-#     "source".length() > 0 (source cannot be empty.)
-#     "target".length() >= 0 (target can be empty.)
-
-# example:
-#   "À" => "A"
-#   "\u00C0" => "A"
-#   "\u00C0" => "\u0041"
-#   "ß" => "ss"
-#   "\t" => " "
-#   "\n" => ""
-
-# À => A
-"\u00C0" => "A"
-
-# Á => A
-"\u00C1" => "A"
-
-# Â => A
-"\u00C2" => "A"
-
-# Ã => A
-"\u00C3" => "A"
-
-# Ä => A
-"\u00C4" => "A"
-
-# Å => A
-"\u00C5" => "A"
-
-# Æ => AE
-"\u00C6" => "AE"
-
-# Ç => C
-"\u00C7" => "C"
-
-# È => E
-"\u00C8" => "E"
-
-# É => E
-"\u00C9" => "E"
-
-# Ê => E
-"\u00CA" => "E"
-
-# Ë => E
-"\u00CB" => "E"
-
-# Ì => I
-"\u00CC" => "I"
-
-# Í => I
-"\u00CD" => "I"
-
-# Î => I
-"\u00CE" => "I"
-
-# Ï => I
-"\u00CF" => "I"
-
-# IJ => IJ
-"\u0132" => "IJ"
-
-# Ð => D
-"\u00D0" => "D"
-
-# Ñ => N
-"\u00D1" => "N"
-
-# Ò => O
-"\u00D2" => "O"
-
-# Ó => O
-"\u00D3" => "O"
-
-# Ô => O
-"\u00D4" => "O"
-
-# Õ => O
-"\u00D5" => "O"
-
-# Ö => O
-"\u00D6" => "O"
-
-# Ø => O
-"\u00D8" => "O"
-
-# Π=> OE
-"\u0152" => "OE"
-
-# Þ
-"\u00DE" => "TH"
-
-# Ù => U
-"\u00D9" => "U"
-
-# Ú => U
-"\u00DA" => "U"
-
-# Û => U
-"\u00DB" => "U"
-
-# Ü => U
-"\u00DC" => "U"
-
-# Ý => Y
-"\u00DD" => "Y"
-
-# Ÿ => Y
-"\u0178" => "Y"
-
-# à => a
-"\u00E0" => "a"
-
-# á => a
-"\u00E1" => "a"
-
-# â => a
-"\u00E2" => "a"
-
-# ã => a
-"\u00E3" => "a"
-
-# ä => a
-"\u00E4" => "a"
-
-# å => a
-"\u00E5" => "a"
-
-# æ => ae
-"\u00E6" => "ae"
-
-# ç => c
-"\u00E7" => "c"
-
-# è => e
-"\u00E8" => "e"
-
-# é => e
-"\u00E9" => "e"
-
-# ê => e
-"\u00EA" => "e"
-
-# ë => e
-"\u00EB" => "e"
-
-# ì => i
-"\u00EC" => "i"
-
-# í => i
-"\u00ED" => "i"
-
-# î => i
-"\u00EE" => "i"
-
-# ï => i
-"\u00EF" => "i"
-
-# ij => ij
-"\u0133" => "ij"
-
-# ð => d
-"\u00F0" => "d"
-
-# ñ => n
-"\u00F1" => "n"
-
-# ò => o
-"\u00F2" => "o"
-
-# ó => o
-"\u00F3" => "o"
-
-# ô => o
-"\u00F4" => "o"
-
-# õ => o
-"\u00F5" => "o"
-
-# ö => o
-"\u00F6" => "o"
-
-# ø => o
-"\u00F8" => "o"
-
-# œ => oe
-"\u0153" => "oe"
-
-# ß => ss
-"\u00DF" => "ss"
-
-# þ => th
-"\u00FE" => "th"
-
-# ù => u
-"\u00F9" => "u"
-
-# ú => u
-"\u00FA" => "u"
-
-# û => u
-"\u00FB" => "u"
-
-# ü => u
-"\u00FC" => "u"
-
-# ý => y
-"\u00FD" => "y"
-
-# ÿ => y
-"\u00FF" => "y"
-
-# ff => ff
-"\uFB00" => "ff"
-
-# fi => fi
-"\uFB01" => "fi"
-
-# fl => fl
-"\uFB02" => "fl"
-
-# ffi => ffi
-"\uFB03" => "ffi"
-
-# ffl => ffl
-"\uFB04" => "ffl"
-
-# ſt => ft
-"\uFB05" => "ft"
-
-# st => st
-"\uFB06" => "st"

solr/conf/protwords.txt

@@ -1,21 +0,0 @@
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#-----------------------------------------------------------------------
-# Use a protected word file to protect against the stemmer reducing two
-# unrelated words to the same base word.
-
-# Some non-words that normally won't be encountered,
-# just to test that they won't be stemmed.
-dontstems
-zwhacky
-

solr/conf/schema.xml

@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!--  
- This is the Solr schema file. This file should be named "schema.xml" and
- should be in the conf directory under the solr home
- (i.e. ./solr/conf/schema.xml by default) 
- or located where the classloader for the Solr webapp can find it.
-
- This example schema is the recommended starting point for users.
- It should be kept correct and concise, usable out-of-the-box.
-
- For more information, on how to customize this file, please see
- http://wiki.apache.org/solr/SchemaXml
-
- PERFORMANCE NOTE: this schema includes many optional features and should not
- be used for benchmarking.  To improve performance one could
-  - set stored="false" for all fields possible (esp large fields) when you
-    only need to search on the field but don't need to return the original
-    value.
-  - set indexed="false" if you don't need to search on the field, but only
-    return the field as a result of searching on other indexed fields.
-  - remove all unneeded copyField statements
-  - for best index size and searching performance, set "index" to false
-    for all general text fields, use copyField to copy them to the
-    catchall "text" field, and use that for searching.
-  - For maximum indexing performance, use the StreamingUpdateSolrServer
-    java client.
-  - Remember to run the JVM in server mode, and use a higher logging level
-    that avoids logging every request
--->
-<schema name="sunspot" version="1.0">
-  <types>
-    <!-- field type definitions. The "name" attribute is
-       just a label to be used by field definitions.  The "class"
-       attribute and any other attributes determine the real
-       behavior of the fieldType.
-         Class names starting with "solr" refer to java classes in the
-       org.apache.solr.analysis package.
-    -->
-    <!-- *** This fieldType is used by Sunspot! *** -->
-    <fieldType name="string" class="solr.StrField" omitNorms="true"/>
-    <!-- *** This fieldType is used by Sunspot! *** -->
-    <fieldType name="tdouble" class="solr.TrieDoubleField" omitNorms="true"/>
-    <!-- *** This fieldType is used by Sunspot! *** -->
-    <fieldType name="rand" class="solr.RandomSortField" omitNorms="true"/>
-    <!-- *** This fieldType is used by Sunspot! *** -->
-    <fieldType name="text" class="solr.TextField" omitNorms="false">
-      <analyzer>
-        <tokenizer class="solr.CJKTokenizerFactory"/>
-        <filter class="solr.StandardFilterFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-      </analyzer>
-    </fieldType>
-    <!-- *** This fieldType is used by Sunspot! *** -->
-    <fieldType name="boolean" class="solr.BoolField" omitNorms="true"/>
-    <!-- *** This fieldType is used by Sunspot! *** -->
-    <fieldType name="date" class="solr.DateField" omitNorms="true"/>
-    <!-- *** This fieldType is used by Sunspot! *** -->
-    <fieldType name="sdouble" class="solr.SortableDoubleField" omitNorms="true"/>
-    <!-- *** This fieldType is used by Sunspot! *** -->
-    <fieldType name="sfloat" class="solr.SortableFloatField" omitNorms="true"/>
-    <!-- *** This fieldType is used by Sunspot! *** -->
-    <fieldType name="sint" class="solr.SortableIntField" omitNorms="true"/>
-    <!-- *** This fieldType is used by Sunspot! *** -->
-    <fieldType name="slong" class="solr.SortableLongField" omitNorms="true"/>
-    <!-- *** This fieldType is used by Sunspot! *** -->
-    <fieldType name="tint" class="solr.TrieIntField" omitNorms="true"/>
-    <!-- *** This fieldType is used by Sunspot! *** -->
-    <fieldType name="tfloat" class="solr.TrieFloatField" omitNorms="true"/>
-    <!-- *** This fieldType is used by Sunspot! *** -->
-    <fieldType name="tdate" class="solr.TrieDateField" omitNorms="true"/>
-  </types>
-  <fields>
-    <!-- Valid attributes for fields:
-     name: mandatory - the name for the field
-     type: mandatory - the name of a previously defined type from the 
-       <types> section
-     indexed: true if this field should be indexed (searchable or sortable)
-     stored: true if this field should be retrievable
-     compressed: [false] if this field should be stored using gzip compression
-       (this will only apply if the field type is compressable; among
-       the standard field types, only TextField and StrField are)
-     multiValued: true if this field may contain multiple values per document
-     omitNorms: (expert) set to true to omit the norms associated with
-       this field (this disables length normalization and index-time
-       boosting for the field, and saves some memory).  Only full-text
-       fields or fields that need an index-time boost need norms.
-     termVectors: [false] set to true to store the term vector for a
-       given field.
-       When using MoreLikeThis, fields used for similarity should be
-       stored for best performance.
-     termPositions: Store position information with the term vector.  
-       This will increase storage costs.
-     termOffsets: Store offset information with the term vector. This 
-       will increase storage costs.
-     default: a value that should be used if no value is specified
-       when adding a document.
-   -->
-    <!-- *** This field is used by Sunspot! *** -->
-    <field name="id" stored="true" type="string" multiValued="false" indexed="true"/>
-    <!-- *** This field is used by Sunspot! *** -->
-    <field name="type" stored="false" type="string" multiValued="true" indexed="true"/>
-    <!-- *** This field is used by Sunspot! *** -->
-    <field name="class_name" stored="false" type="string" multiValued="false" indexed="true"/>
-    <!-- *** This field is used by Sunspot! *** -->
-    <field name="text" stored="false" type="string" multiValued="true" indexed="true"/>
-    <!-- *** This field is used by Sunspot! *** -->
-    <field name="lat" stored="true" type="tdouble" multiValued="false" indexed="true"/>
-    <!-- *** This field is used by Sunspot! *** -->
-    <field name="lng" stored="true" type="tdouble" multiValued="false" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="random_*" stored="false" type="rand" multiValued="false" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="_local*" stored="false" type="tdouble" multiValued="false" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_text" stored="false" type="text" multiValued="true" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_texts" stored="true" type="text" multiValued="true" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_b" stored="false" type="boolean" multiValued="false" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_bm" stored="false" type="boolean" multiValued="true" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_bs" stored="true" type="boolean" multiValued="false" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_bms" stored="true" type="boolean" multiValued="true" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_d" stored="false" type="date" multiValued="false" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_dm" stored="false" type="date" multiValued="true" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_ds" stored="true" type="date" multiValued="false" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_dms" stored="true" type="date" multiValued="true" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_e" stored="false" type="sdouble" multiValued="false" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_em" stored="false" type="sdouble" multiValued="true" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_es" stored="true" type="sdouble" multiValued="false" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_ems" stored="true" type="sdouble" multiValued="true" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_f" stored="false" type="sfloat" multiValued="false" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_fm" stored="false" type="sfloat" multiValued="true" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_fs" stored="true" type="sfloat" multiValued="false" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_fms" stored="true" type="sfloat" multiValued="true" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_i" stored="false" type="sint" multiValued="false" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_im" stored="false" type="sint" multiValued="true" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_is" stored="true" type="sint" multiValued="false" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_ims" stored="true" type="sint" multiValued="true" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_l" stored="false" type="slong" multiValued="false" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_lm" stored="false" type="slong" multiValued="true" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_ls" stored="true" type="slong" multiValued="false" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_lms" stored="true" type="slong" multiValued="true" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_s" stored="false" type="string" multiValued="false" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_sm" stored="false" type="string" multiValued="true" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_ss" stored="true" type="string" multiValued="false" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_sms" stored="true" type="string" multiValued="true" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_it" stored="false" type="tint" multiValued="false" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_itm" stored="false" type="tint" multiValued="true" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_its" stored="true" type="tint" multiValued="false" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_itms" stored="true" type="tint" multiValued="true" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_ft" stored="false" type="tfloat" multiValued="false" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_ftm" stored="false" type="tfloat" multiValued="true" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_fts" stored="true" type="tfloat" multiValued="false" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_ftms" stored="true" type="tfloat" multiValued="true" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_dt" stored="false" type="tdate" multiValued="false" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_dtm" stored="false" type="tdate" multiValued="true" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_dts" stored="true" type="tdate" multiValued="false" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_dtms" stored="true" type="tdate" multiValued="true" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_textv" stored="false" termVectors="true" type="text" multiValued="true" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_textsv" stored="true" termVectors="true" type="text" multiValued="true" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_et" stored="false" termVectors="true" type="tdouble" multiValued="false" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_etm" stored="false" termVectors="true" type="tdouble" multiValued="true" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_ets" stored="true" termVectors="true" type="tdouble" multiValued="false" indexed="true"/>
-    <!-- *** This dynamicField is used by Sunspot! *** -->
-    <dynamicField name="*_etms" stored="true" termVectors="true" type="tdouble" multiValued="true" indexed="true"/>
-  </fields>
-  <!-- Field to use to determine and enforce document uniqueness. 
-      Unless this field is marked with required="false", it will be a required field
-   -->
-  <uniqueKey>id</uniqueKey>
-  <!-- field for the QueryParser to use when an explicit fieldname is absent -->
-  <defaultSearchField>text</defaultSearchField>
-  <!-- SolrQueryParser configuration: defaultOperator="AND|OR" -->
-  <solrQueryParser defaultOperator="AND"/>
-  <!-- copyField commands copy one field to another at the time a document
-        is added to the index.  It's used either to index the same field differently,
-        or to add multiple fields to the same field for easier/faster searching.  -->
-</schema>

solr/conf/scripts.conf

@@ -1,24 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-user=
-solr_hostname=localhost
-solr_port=8983
-rsyncd_port=18983
-data_dir=
-webapp_name=solr
-master_host=
-master_data_dir=
-master_status_dir=

solr/conf/solrconfig.xml

@@ -1,934 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!-- 
-     For more details about configurations options that may appear in this 
-     file, see http://wiki.apache.org/solr/SolrConfigXml.
-
-     Specifically, the Solr Config can support XInclude, which may make it easier to manage
-     the configuration.  See https://issues.apache.org/jira/browse/SOLR-1167
--->
-<config>
-  <!-- Set this to 'false' if you want solr to continue working after it has 
-       encountered an severe configuration error.  In a production environment, 
-       you may want solr to keep working even if one handler is mis-configured.
-
-       You may also set this to false using by setting the system property:
-         -Dsolr.abortOnConfigurationError=false
-     -->
-  <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
-  <!-- lib directives can be used to instruct Solr to load an Jars identified
-       and use them to resolve any "plugins" specified in your solrconfig.xml or
-       schema.xml (ie: Analyzers, Request Handlers, etc...).
-
-       All directories and paths are resolved relative the instanceDir.
-
-       If a "./lib" directory exists in your instanceDir, all files found in it
-       are included as if you had used the following syntax...
-       
-              <lib dir="./lib" />
-    -->
-  <!-- A dir option by itself adds any files found in the directory to the
-       classpath, this is useful for including all jars in a directory.
-    -->
-  <lib dir="../../contrib/extraction/lib"/>
-  <!-- When a regex is specified in addition to a directory, only the files in that
-       directory which completely match the regex (anchored on both ends)
-       will be included.
-    -->
-  <lib dir="../../dist/" regex="apache-solr-cell-\d.*\.jar"/>
-  <lib dir="../../dist/" regex="apache-solr-clustering-\d.*\.jar"/>
-  <!-- If a dir option (with or without a regex) is used and nothing is found
-       that matches, it will be ignored
-    -->
-  <lib dir="../../contrib/clustering/lib/downloads/"/>
-  <lib dir="../../contrib/clustering/lib/"/>
-  <lib dir="/total/crap/dir/ignored"/>
-  <!-- an exact path can be used to specify a specific file.  This will cause
-       a serious error to be logged if it can't be loaded.
-  <lib path="../a-jar-that-does-not-exist.jar" /> 
-  -->
-  <!-- Used to specify an alternate directory to hold all index data
-       other than the default ./data under the Solr home.
-       If replication is in use, this should match the replication configuration. -->
-  <dataDir>${solr.data.dir:./solr/data}</dataDir>
-  <!-- WARNING: this <indexDefaults> section only provides defaults for index writers
-       in general. See also the <mainIndex> section after that when changing parameters
-       for Solr's main Lucene index. -->
-  <indexDefaults>
-    <!-- Values here affect all index writers and act as a default unless overridden. -->
-    <useCompoundFile>false</useCompoundFile>
-    <mergeFactor>10</mergeFactor>
-    <!-- If both ramBufferSizeMB and maxBufferedDocs is set, then Lucene will flush
-     based on whichever limit is hit first.  -->
-    <!--<maxBufferedDocs>1000</maxBufferedDocs>-->
-    <!-- Sets the amount of RAM that may be used by Lucene indexing
-      for buffering added documents and deletions before they are
-      flushed to the Directory.  -->
-    <ramBufferSizeMB>32</ramBufferSizeMB>
-    <!-- <maxMergeDocs>2147483647</maxMergeDocs> -->
-    <maxFieldLength>10000</maxFieldLength>
-    <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
-    <!--
-     Expert: Turn on Lucene's auto commit capability.  This causes intermediate
-     segment flushes to write a new lucene index descriptor, enabling it to be
-     opened by an external IndexReader.  This can greatly slow down indexing
-     speed.  NOTE: Despite the name, this value does not have any relation to
-     Solr's autoCommit functionality
-     -->
-    <!--<luceneAutoCommit>false</luceneAutoCommit>-->
-    <!--
-     Expert: The Merge Policy in Lucene controls how merging is handled by
-     Lucene.  The default in 2.3 is the LogByteSizeMergePolicy, previous
-     versions used LogDocMergePolicy.
-
-     LogByteSizeMergePolicy chooses segments to merge based on their size.  The
-     Lucene 2.2 default, LogDocMergePolicy chose when to merge based on number
-     of documents
-
-     Other implementations of MergePolicy must have a no-argument constructor
-     -->
-    <!--<mergePolicy class="org.apache.lucene.index.LogByteSizeMergePolicy"/>-->
-    <!--
-     Expert:
-     The Merge Scheduler in Lucene controls how merges are performed.  The
-     ConcurrentMergeScheduler (Lucene 2.3 default) can perform merges in the
-     background using separate threads.  The SerialMergeScheduler (Lucene 2.2
-     default) does not.
-     -->
-    <!--<mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/>-->
-    <!--
-      This option specifies which Lucene LockFactory implementation to use.
-      
-      single = SingleInstanceLockFactory - suggested for a read-only index
-               or when there is no possibility of another process trying
-               to modify the index.
-      native = NativeFSLockFactory  - uses OS native file locking
-      simple = SimpleFSLockFactory  - uses a plain file for locking
-
-      (For backwards compatibility with Solr 1.2, 'simple' is the default
-       if not specified.)
-    -->
-    <lockType>native</lockType>
-    <!--
-     Expert:
-    Controls how often Lucene loads terms into memory -->
-    <!--<termIndexInterval>256</termIndexInterval>-->
-  </indexDefaults>
-  <mainIndex>
-    <!-- options specific to the main on-disk lucene index -->
-    <useCompoundFile>false</useCompoundFile>
-    <ramBufferSizeMB>32</ramBufferSizeMB>
-    <mergeFactor>10</mergeFactor>
-    <!-- Deprecated -->
-    <!--<maxBufferedDocs>1000</maxBufferedDocs>-->
-    <!--<maxMergeDocs>2147483647</maxMergeDocs>-->
-    <!-- inherit from indexDefaults <maxFieldLength>10000</maxFieldLength> -->
-    <!-- If true, unlock any held write or commit locks on startup. 
-         This defeats the locking mechanism that allows multiple
-         processes to safely access a lucene index, and should be
-         used with care.
-         This is not needed if lock type is 'none' or 'single'
-     -->
-    <unlockOnStartup>false</unlockOnStartup>
-    <!-- If true, IndexReaders will be reopened (often more efficient) instead
-         of closed and then opened.  -->
-    <reopenReaders>true</reopenReaders>
-    <!--
-     Expert:
-    Controls how often Lucene loads terms into memory.  Default is 128 and is likely good for most everyone. -->
-    <!--<termIndexInterval>256</termIndexInterval>-->
-    <!--
-        Custom deletion policies can specified here. The class must
-        implement org.apache.lucene.index.IndexDeletionPolicy.
-
-        http://lucene.apache.org/java/2_3_2/api/org/apache/lucene/index/IndexDeletionPolicy.html
-
-        The standard Solr IndexDeletionPolicy implementation supports deleting
-        index commit points on number of commits, age of commit point and
-        optimized status.
-
-        The latest commit point should always be preserved regardless
-        of the criteria.
-    -->
-    <deletionPolicy class="solr.SolrDeletionPolicy">
-      <!-- The number of commit points to be kept -->
-      <str name="maxCommitsToKeep">1</str>
-      <!-- The number of optimized commit points to be kept -->
-      <str name="maxOptimizedCommitsToKeep">0</str>
-      <!--
-          Delete all commit points once they have reached the given age.
-          Supports DateMathParser syntax e.g.
-          
-          <str name="maxCommitAge">30MINUTES</str>
-          <str name="maxCommitAge">1DAY</str>
-      -->
-    </deletionPolicy>
-    <!--  To aid in advanced debugging, you may turn on IndexWriter debug logging.
-      Setting to true will set the file that the underlying Lucene IndexWriter
-      will write its debug infostream to.  -->
-    <infoStream file="INFOSTREAM.txt">false</infoStream>
-  </mainIndex>
-  <!--	Enables JMX if and only if an existing MBeanServer is found, use this
-    if you want to configure JMX through JVM parameters. Remove this to disable
-    exposing Solr configuration and statistics to JMX.
-
-		If you want to connect to a particular server, specify the agentId
-		e.g. <jmx agentId="myAgent" />
-
-		If you want to start a new MBeanServer, specify the serviceUrl
-		e.g <jmx serviceUrl="service:jmx:rmi:///jndi/rmi://localhost:9999/solr"/>
-
-		For more details see http://wiki.apache.org/solr/SolrJmx
-  -->
-  <jmx/>
-  <!-- the default high-performance update handler -->
-  <updateHandler class="solr.DirectUpdateHandler2">
-    <!-- A prefix of "solr." for class names is an alias that
-         causes solr to search appropriate packages, including
-         org.apache.solr.(search|update|request|core|analysis)
-     -->
-    <!-- Perform a <commit/> automatically under certain conditions:
-         maxDocs - number of updates since last commit is greater than this
-         maxTime - oldest uncommited update (in ms) is this long ago
-         Instead of enabling autoCommit, consider using "commitWithin"
-         when adding documents. http://wiki.apache.org/solr/UpdateXmlMessages
-    <autoCommit> 
-      <maxDocs>10000</maxDocs>
-      <maxTime>1000</maxTime> 
-    </autoCommit>
-    -->
-    <!-- The RunExecutableListener executes an external command from a
-      hook such as postCommit or postOptimize.
-         exe - the name of the executable to run
-         dir - dir to use as the current working directory. default="."
-         wait - the calling thread waits until the executable returns. default="true"
-         args - the arguments to pass to the program.  default=nothing
-         env - environment variables to set.  default=nothing
-      -->
-    <!-- A postCommit event is fired after every commit or optimize command
-    <listener event="postCommit" class="solr.RunExecutableListener">
-      <str name="exe">solr/bin/snapshooter</str>
-      <str name="dir">.</str>
-      <bool name="wait">true</bool>
-      <arr name="args"> <str>arg1</str> <str>arg2</str> </arr>
-      <arr name="env"> <str>MYVAR=val1</str> </arr>
-    </listener>
-    -->
-    <!-- A postOptimize event is fired only after every optimize command
-    <listener event="postOptimize" class="solr.RunExecutableListener">
-      <str name="exe">snapshooter</str>
-      <str name="dir">solr/bin</str>
-      <bool name="wait">true</bool>
-    </listener>
-    -->
-  </updateHandler>
-  <!-- Use the following format to specify a custom IndexReaderFactory - allows for alternate
-       IndexReader implementations.
-
-       ** Experimental Feature **
-       Please note - Using a custom IndexReaderFactory may prevent certain other features
-       from working. The API to IndexReaderFactory may change without warning or may even
-       be removed from future releases if the problems cannot be resolved.
-
-       ** Features that may not work with custom IndexReaderFactory **
-       The ReplicationHandler assumes a disk-resident index. Using a custom
-       IndexReader implementation may cause incompatibility with ReplicationHandler and
-       may cause replication to not work correctly. See SOLR-1366 for details.
-
-  <indexReaderFactory name="IndexReaderFactory" class="package.class">
-    Parameters as required by the implementation
-  </indexReaderFactory >
-  -->
-  <!-- To set the termInfosIndexDivisor, do this: -->
-  <!--<indexReaderFactory name="IndexReaderFactory" class="org.apache.solr.core.StandardIndexReaderFactory">
-    <int name="termInfosIndexDivisor">12</int>
-  </indexReaderFactory >-->
-  <query>
-    <!-- Maximum number of clauses in a boolean query... in the past, this affected
-        range or prefix queries that expanded to big boolean queries - built in Solr 
-        query parsers no longer create queries with this limitation. 
-        An exception is thrown if exceeded.  -->
-    <maxBooleanClauses>1024</maxBooleanClauses>
-    <!-- There are two implementations of cache available for Solr,
-         LRUCache, based on a synchronized LinkedHashMap, and
-         FastLRUCache, based on a ConcurrentHashMap.  FastLRUCache has faster gets
-         and slower puts in single threaded operation and thus is generally faster
-         than LRUCache when the hit ratio of the cache is high (> 75%), and may be
-         faster under other scenarios on multi-cpu systems. -->
-    <!-- Cache used by SolrIndexSearcher for filters (DocSets),
-         unordered sets of *all* documents that match a query.
-         When a new searcher is opened, its caches may be prepopulated
-         or "autowarmed" using data from caches in the old searcher.
-         autowarmCount is the number of items to prepopulate.  For LRUCache,
-         the autowarmed items will be the most recently accessed items.
-       Parameters:
-         class - the SolrCache implementation LRUCache or FastLRUCache
-         size - the maximum number of entries in the cache
-         initialSize - the initial capacity (number of entries) of
-           the cache.  (seel java.util.HashMap)
-         autowarmCount - the number of entries to prepopulate from
-           and old cache.
-         -->
-    <filterCache class="solr.FastLRUCache" size="512" initialSize="512" autowarmCount="0"/>
-    <!-- Cache used to hold field values that are quickly accessible
-         by document id.  The fieldValueCache is created by default
-         even if not configured here.
-      <fieldValueCache
-        class="solr.FastLRUCache"
-        size="512"
-        autowarmCount="128"
-        showItems="32"
-      />
-    -->
-    <!-- queryResultCache caches results of searches - ordered lists of
-         document ids (DocList) based on a query, a sort, and the range
-         of documents requested.  -->
-    <queryResultCache class="solr.LRUCache" size="512" initialSize="512" autowarmCount="0"/>
-    <!-- documentCache caches Lucene Document objects (the stored fields for each document).
-       Since Lucene internal document ids are transient, this cache will not be autowarmed.  -->
-    <documentCache class="solr.LRUCache" size="512" initialSize="512" autowarmCount="0"/>
-    <!-- If true, stored fields that are not requested will be loaded lazily.
-      This can result in a significant speed improvement if the usual case is to
-      not load all stored fields, especially if the skipped fields are large
-      compressed text fields.
-    -->
-    <enableLazyFieldLoading>true</enableLazyFieldLoading>
-    <!-- Example of a generic cache.  These caches may be accessed by name
-         through SolrIndexSearcher.getCache(),cacheLookup(), and cacheInsert().
-         The purpose is to enable easy caching of user/application level data.
-         The regenerator argument should be specified as an implementation
-         of solr.search.CacheRegenerator if autowarming is desired.  -->
-    <!--
-    <cache name="myUserCache"
-      class="solr.LRUCache"
-      size="4096"
-      initialSize="1024"
-      autowarmCount="1024"
-      regenerator="org.mycompany.mypackage.MyRegenerator"
-      />
-    -->
-    <!-- An optimization that attempts to use a filter to satisfy a search.
-         If the requested sort does not include score, then the filterCache
-         will be checked for a filter matching the query. If found, the filter
-         will be used as the source of document ids, and then the sort will be
-         applied to that.
-    <useFilterForSortedQuery>true</useFilterForSortedQuery>
-   -->
-    <!-- An optimization for use with the queryResultCache.  When a search
-         is requested, a superset of the requested number of document ids
-         are collected.  For example, if a search for a particular query
-         requests matching documents 10 through 19, and queryWindowSize is 50,
-         then documents 0 through 49 will be collected and cached.  Any further
-         requests in that range can be satisfied via the cache.  -->
-    <queryResultWindowSize>20</queryResultWindowSize>
-    <!-- Maximum number of documents to cache for any entry in the
-         queryResultCache. -->
-    <queryResultMaxDocsCached>200</queryResultMaxDocsCached>
-    <!-- a newSearcher event is fired whenever a new searcher is being prepared
-      and there is a current searcher handling requests (aka registered).
-      It can be used to prime certain caches to prevent long request times for
-      certain requests.
-    -->
-    <!-- QuerySenderListener takes an array of NamedList and executes a
-         local query request for each NamedList in sequence. -->
-    <listener event="newSearcher" class="solr.QuerySenderListener">
-      <arr name="queries">
-        <!--
-        <lst> <str name="q">solr</str> <str name="start">0</str> <str name="rows">10</str> </lst>
-        <lst> <str name="q">rocks</str> <str name="start">0</str> <str name="rows">10</str> </lst>
-        <lst><str name="q">static newSearcher warming query from solrconfig.xml</str></lst>
-        -->
-      </arr>
-    </listener>
-    <!-- a firstSearcher event is fired whenever a new searcher is being
-         prepared but there is no current registered searcher to handle
-         requests or to gain autowarming data from. -->
-    <listener event="firstSearcher" class="solr.QuerySenderListener">
-      <arr name="queries">
-        <lst>
-          <str name="q">solr rocks</str>
-          <str name="start">0</str>
-          <str name="rows">10</str>
-        </lst>
-        <lst>
-          <str name="q">static firstSearcher warming query from solrconfig.xml</str>
-        </lst>
-      </arr>
-    </listener>
-    <!-- If a search request comes in and there is no current registered searcher,
-         then immediately register the still warming searcher and use it.  If
-         "false" then all requests will block until the first searcher is done
-         warming. -->
-    <useColdSearcher>false</useColdSearcher>
-    <!-- Maximum number of searchers that may be warming in the background
-      concurrently.  An error is returned if this limit is exceeded. Recommend
-      1-2 for read-only slaves, higher for masters w/o cache warming. -->
-    <maxWarmingSearchers>2</maxWarmingSearchers>
-  </query>
-  <!-- 
-    Let the dispatch filter handler /select?qt=XXX
-    handleSelect=true will use consistent error handling for /select and /update
-    handleSelect=false will use solr1.1 style error formatting
-    -->
-  <requestDispatcher handleSelect="true">
-    <!--Make sure your system has some authentication before enabling remote streaming!  -->
-    <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048000"/>
-    <!-- Set HTTP caching related parameters (for proxy caches and clients).
-          
-         To get the behaviour of Solr 1.2 (ie: no caching related headers)
-         use the never304="true" option and do not specify a value for
-         <cacheControl>
-    -->
-    <!-- <httpCaching never304="true"> -->
-    <httpCaching lastModifiedFrom="openTime" etagSeed="Solr">
-      <!-- lastModFrom="openTime" is the default, the Last-Modified value
-            (and validation against If-Modified-Since requests) will all be
-            relative to when the current Searcher was opened.
-            You can change it to lastModFrom="dirLastMod" if you want the
-            value to exactly corrispond to when the physical index was last
-            modified.
-
-            etagSeed="..." is an option you can change to force the ETag
-            header (and validation against If-None-Match requests) to be
-            differnet even if the index has not changed (ie: when making
-            significant changes to your config file)
-
-            lastModifiedFrom and etagSeed are both ignored if you use the
-            never304="true" option.
-       -->
-      <!-- If you include a <cacheControl> directive, it will be used to
-            generate a Cache-Control header, as well as an Expires header
-            if the value contains "max-age="
-
-            By default, no Cache-Control header is generated.
-
-            You can use the <cacheControl> option even if you have set
-            never304="true"
-       -->
-      <!-- <cacheControl>max-age=30, public</cacheControl> -->
-    </httpCaching>
-  </requestDispatcher>
-  <!-- requestHandler plugins... incoming queries will be dispatched to the
-     correct handler based on the path or the qt (query type) param.
-     Names starting with a '/' are accessed with the a path equal to the 
-     registered name.  Names without a leading '/' are accessed with:
-      http://host/app/select?qt=name
-     If no qt is defined, the requestHandler that declares default="true"
-     will be used.
-  -->
-  <requestHandler name="standard" class="solr.SearchHandler" default="true">
-    <!-- default values for query parameters -->
-    <lst name="defaults">
-      <str name="echoParams">explicit</str>
-      <!--
-       <int name="rows">10</int>
-       <str name="fl">*</str>
-       <str name="version">2.1</str>
-        -->
-    </lst>
-  </requestHandler>
-  <!-- Please refer to http://wiki.apache.org/solr/SolrReplication for details on configuring replication -->
-  <!-- remove the <lst name="master"> section if this is just a slave -->
-  <!-- remove  the <lst name="slave"> section if this is just a master -->
-  <!--
-<requestHandler name="/replication" class="solr.ReplicationHandler" >
-    <lst name="master">
-      <str name="replicateAfter">commit</str>
-      <str name="replicateAfter">startup</str>
-      <str name="confFiles">schema.xml,stopwords.txt</str>
-    </lst>
-    <lst name="slave">
-      <str name="masterUrl">http://localhost:8983/solr/replication</str>
-      <str name="pollInterval">00:00:60</str>
-    </lst>
-</requestHandler>-->
-  <!-- DisMaxRequestHandler allows easy searching across multiple fields
-       for simple user-entered phrases.  It's implementation is now
-       just the standard SearchHandler with a default query type
-       of "dismax". 
-       see http://wiki.apache.org/solr/DisMaxRequestHandler
-   -->
-  <requestHandler name="dismax" class="solr.SearchHandler">
-    <lst name="defaults">
-      <str name="defType">dismax</str>
-      <str name="echoParams">explicit</str>
-      <float name="tie">0.01</float>
-      <str name="qf">
-        text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4
-     </str>
-      <str name="pf">
-        text^0.2 features^1.1 name^1.5 manu^1.4 manu_exact^1.9
-     </str>
-      <str name="bf">
-        popularity^0.5 recip(price,1,1000,1000)^0.3
-     </str>
-      <str name="fl">
-        id,name,price,score
-     </str>
-      <str name="mm">
-        2&lt;-1 5&lt;-2 6&lt;90%
-     </str>
-      <int name="ps">100</int>
-      <str name="q.alt">*:*</str>
-      <!-- example highlighter config, enable per-query with hl=true -->
-      <str name="hl.fl">text features name</str>
-      <!-- for this field, we want no fragmenting, just highlighting -->
-      <str name="f.name.hl.fragsize">0</str>
-      <!-- instructs Solr to return the field itself if no query terms are
-          found -->
-      <str name="f.name.hl.alternateField">name</str>
-      <str name="f.text.hl.fragmenter">regex</str>
-      <!-- defined below -->
-    </lst>
-  </requestHandler>
-  <!-- Note how you can register the same handler multiple times with
-       different names (and different init parameters)
-    -->
-  <requestHandler name="partitioned" class="solr.SearchHandler">
-    <lst name="defaults">
-      <str name="defType">dismax</str>
-      <str name="echoParams">explicit</str>
-      <str name="qf">text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0</str>
-      <str name="mm">2&lt;-1 5&lt;-2 6&lt;90%</str>
-      <!-- This is an example of using Date Math to specify a constantly
-          moving date range in a config...
-       -->
-      <str name="bq">incubationdate_dt:[* TO NOW/DAY-1MONTH]^2.2</str>
-    </lst>
-    <!-- In addition to defaults, "appends" params can be specified
-         to identify values which should be appended to the list of
-         multi-val params from the query (or the existing "defaults").
-
-         In this example, the param "fq=instock:true" will be appended to
-         any query time fq params the user may specify, as a mechanism for
-         partitioning the index, independent of any user selected filtering
-         that may also be desired (perhaps as a result of faceted searching).
-
-         NOTE: there is *absolutely* nothing a client can do to prevent these
-         "appends" values from being used, so don't use this mechanism
-         unless you are sure you always want it.
-      -->
-    <lst name="appends">
-      <str name="fq">inStock:true</str>
-    </lst>
-    <!-- "invariants" are a way of letting the Solr maintainer lock down
-         the options available to Solr clients.  Any params values
-         specified here are used regardless of what values may be specified
-         in either the query, the "defaults", or the "appends" params.
-
-         In this example, the facet.field and facet.query params are fixed,
-         limiting the facets clients can use.  Faceting is not turned on by
-         default - but if the client does specify facet=true in the request,
-         these are the only facets they will be able to see counts for;
-         regardless of what other facet.field or facet.query params they
-         may specify.
-
-         NOTE: there is *absolutely* nothing a client can do to prevent these
-         "invariants" values from being used, so don't use this mechanism
-         unless you are sure you always want it.
-      -->
-    <lst name="invariants">
-      <str name="facet.field">cat</str>
-      <str name="facet.field">manu_exact</str>
-      <str name="facet.query">price:[* TO 500]</str>
-      <str name="facet.query">price:[500 TO *]</str>
-    </lst>
-  </requestHandler>
-  <!--
-   Search components are registered to SolrCore and used by Search Handlers
-   
-   By default, the following components are avaliable:
-    
-   <searchComponent name="query"     class="org.apache.solr.handler.component.QueryComponent" />
-   <searchComponent name="facet"     class="org.apache.solr.handler.component.FacetComponent" />
-   <searchComponent name="mlt"       class="org.apache.solr.handler.component.MoreLikeThisComponent" />
-   <searchComponent name="highlight" class="org.apache.solr.handler.component.HighlightComponent" />
-   <searchComponent name="stats"     class="org.apache.solr.handler.component.StatsComponent" />
-   <searchComponent name="debug"     class="org.apache.solr.handler.component.DebugComponent" />
-   
-   Default configuration in a requestHandler would look like:
-    <arr name="components">
-      <str>query</str>
-      <str>facet</str>
-      <str>mlt</str>
-      <str>highlight</str>
-      <str>stats</str>
-      <str>debug</str>
-    </arr>
-
-    If you register a searchComponent to one of the standard names, that will be used instead.
-    To insert components before or after the 'standard' components, use:
-    
-    <arr name="first-components">
-      <str>myFirstComponentName</str>
-    </arr>
-    
-    <arr name="last-components">
-      <str>myLastComponentName</str>
-    </arr>
-  -->
-  <!-- The spell check component can return a list of alternative spelling
-  suggestions.  -->
-  <searchComponent name="spellcheck" class="solr.SpellCheckComponent">
-    <str name="queryAnalyzerFieldType">textSpell</str>
-    <lst name="spellchecker">
-      <str name="name">default</str>
-      <str name="field">name</str>
-      <str name="spellcheckIndexDir">./spellchecker</str>
-    </lst>
-    <!-- a spellchecker that uses a different distance measure
-    <lst name="spellchecker">
-      <str name="name">jarowinkler</str>
-      <str name="field">spell</str>
-      <str name="distanceMeasure">org.apache.lucene.search.spell.JaroWinklerDistance</str>
-      <str name="spellcheckIndexDir">./spellchecker2</str>
-    </lst>
-     -->
-    <!-- a file based spell checker
-    <lst name="spellchecker">
-      <str name="classname">solr.FileBasedSpellChecker</str>
-      <str name="name">file</str>
-      <str name="sourceLocation">spellings.txt</str>
-      <str name="characterEncoding">UTF-8</str>
-      <str name="spellcheckIndexDir">./spellcheckerFile</str>
-    </lst>
-    -->
-  </searchComponent>
-  <!-- A request handler utilizing the spellcheck component.  
-  #############################################################################
-  NOTE: This is purely as an example.  The whole purpose of the
-  SpellCheckComponent is to hook it into the request handler that handles (i.e.
-  the standard or dismax SearchHandler) queries such that a separate request is
-  not needed to get suggestions.
-
-  IN OTHER WORDS, THERE IS REALLY GOOD CHANCE THE SETUP BELOW IS NOT WHAT YOU
-  WANT FOR YOUR PRODUCTION SYSTEM!
-  #############################################################################
-  -->
-  <requestHandler name="/spell" class="solr.SearchHandler" lazy="true">
-    <lst name="defaults">
-      <!-- omp = Only More Popular -->
-      <str name="spellcheck.onlyMorePopular">false</str>
-      <!-- exr = Extended Results -->
-      <str name="spellcheck.extendedResults">false</str>
-      <!--  The number of suggestions to return -->
-      <str name="spellcheck.count">1</str>
-    </lst>
-    <arr name="last-components">
-      <str>spellcheck</str>
-    </arr>
-  </requestHandler>
-  <searchComponent name="tvComponent" class="org.apache.solr.handler.component.TermVectorComponent"/>
-  <!-- A Req Handler for working with the tvComponent.  This is purely as an example.
-  You will likely want to add the component to your already specified request handlers. -->
-  <requestHandler name="tvrh" class="org.apache.solr.handler.component.SearchHandler">
-    <lst name="defaults">
-      <bool name="tv">true</bool>
-    </lst>
-    <arr name="last-components">
-      <str>tvComponent</str>
-    </arr>
-  </requestHandler>
-  <!-- Clustering Component
-       http://wiki.apache.org/solr/ClusteringComponent
-       This relies on third party jars which are not included in the release.
-       To use this component (and the "/clustering" handler)
-       Those jars will need to be downloaded, and you'll need to set the
-       solr.cluster.enabled system property when running solr...
-          java -Dsolr.clustering.enabled=true -jar start.jar
-    -->
-  <searchComponent name="clusteringComponent" enable="${solr.clustering.enabled:false}" class="org.apache.solr.handler.clustering.ClusteringComponent">
-    <!-- Declare an engine -->
-    <lst name="engine">
-      <!-- The name, only one can be named "default" -->
-      <str name="name">default</str>
-      <!-- 
-           Class name of Carrot2 clustering algorithm. Currently available algorithms are:
-           
-           * org.carrot2.clustering.lingo.LingoClusteringAlgorithm
-           * org.carrot2.clustering.stc.STCClusteringAlgorithm
-           
-           See http://project.carrot2.org/algorithms.html for the algorithm's characteristics.
-        -->
-      <str name="carrot.algorithm">org.carrot2.clustering.lingo.LingoClusteringAlgorithm</str>
-      <!-- 
-           Overriding values for Carrot2 default algorithm attributes. For a description
-           of all available attributes, see: http://download.carrot2.org/stable/manual/#chapter.components.
-           Use attribute key as name attribute of str elements below. These can be further
-           overridden for individual requests by specifying attribute key as request
-           parameter name and attribute value as parameter value.
-        -->
-      <str name="LingoClusteringAlgorithm.desiredClusterCountBase">20</str>
-    </lst>
-    <lst name="engine">
-      <str name="name">stc</str>
-      <str name="carrot.algorithm">org.carrot2.clustering.stc.STCClusteringAlgorithm</str>
-    </lst>
-  </searchComponent>
-  <requestHandler name="/clustering" enable="${solr.clustering.enabled:false}" class="solr.SearchHandler">
-    <lst name="defaults">
-      <bool name="clustering">true</bool>
-      <str name="clustering.engine">default</str>
-      <bool name="clustering.results">true</bool>
-      <!-- The title field -->
-      <str name="carrot.title">name</str>
-      <str name="carrot.url">id</str>
-      <!-- The field to cluster on -->
-      <str name="carrot.snippet">features</str>
-      <!-- produce summaries -->
-      <bool name="carrot.produceSummary">true</bool>
-      <!-- the maximum number of labels per cluster -->
-      <!--<int name="carrot.numDescriptions">5</int>-->
-      <!-- produce sub clusters -->
-      <bool name="carrot.outputSubClusters">false</bool>
-    </lst>
-    <arr name="last-components">
-      <str>clusteringComponent</str>
-    </arr>
-  </requestHandler>
-  <!-- Solr Cell: http://wiki.apache.org/solr/ExtractingRequestHandler -->
-  <requestHandler name="/update/extract" class="org.apache.solr.handler.extraction.ExtractingRequestHandler" startup="lazy">
-    <lst name="defaults">
-      <!-- All the main content goes into "text"... if you need to return
-           the extracted text or do highlighting, use a stored field. -->
-      <str name="fmap.content">text</str>
-      <str name="lowernames">true</str>
-      <str name="uprefix">ignored_</str>
-      <!-- capture link hrefs but ignore div attributes -->
-      <str name="captureAttr">true</str>
-      <str name="fmap.a">links</str>
-      <str name="fmap.div">ignored_</str>
-    </lst>
-  </requestHandler>
-  <!-- A component to return terms and document frequency of those terms.
-       This component does not yet support distributed search. -->
-  <searchComponent name="termsComponent" class="org.apache.solr.handler.component.TermsComponent"/>
-  <requestHandler name="/terms" class="org.apache.solr.handler.component.SearchHandler">
-    <lst name="defaults">
-      <bool name="terms">true</bool>
-    </lst>
-    <arr name="components">
-      <str>termsComponent</str>
-    </arr>
-  </requestHandler>
-  <!-- a search component that enables you to configure the top results for
-       a given query regardless of the normal lucene scoring.-->
-  <searchComponent name="elevator" class="solr.QueryElevationComponent">
-    <!-- pick a fieldType to analyze queries -->
-    <str name="queryFieldType">string</str>
-    <str name="config-file">elevate.xml</str>
-  </searchComponent>
-  <!-- a request handler utilizing the elevator component -->
-  <requestHandler name="/elevate" class="solr.SearchHandler" startup="lazy">
-    <lst name="defaults">
-      <str name="echoParams">explicit</str>
-    </lst>
-    <arr name="last-components">
-      <str>elevator</str>
-    </arr>
-  </requestHandler>
-  <!-- Update request handler.  
-
-       Note: Since solr1.1 requestHandlers requires a valid content type header if posted in
-       the body. For example, curl now requires: -H 'Content-type:text/xml; charset=utf-8'
-       The response format differs from solr1.1 formatting and returns a standard error code.
-       To enable solr1.1 behavior, remove the /update handler or change its path
-    -->
-  <requestHandler name="/update" class="solr.XmlUpdateRequestHandler"/>
-  <requestHandler name="/update/javabin" class="solr.BinaryUpdateRequestHandler"/>
-  <!--
-   Analysis request handler.  Since Solr 1.3.  Use to return how a document is analyzed.  Useful
-   for debugging and as a token server for other types of applications.
-
-   This is deprecated in favor of the improved DocumentAnalysisRequestHandler and FieldAnalysisRequestHandler
-
-   <requestHandler name="/analysis" class="solr.AnalysisRequestHandler" />
-   -->
-  <!--
-    An analysis handler that provides a breakdown of the analysis process of provided docuemnts. This handler expects a
-    (single) content stream with the following format:
-
-    <docs>
-      <doc>
-        <field name="id">1</field>
-        <field name="name">The Name</field>
-        <field name="text">The Text Value</field>
-      <doc>
-      <doc>...</doc>
-      <doc>...</doc>
-      ...
-    </docs>
-
-    Note: Each document must contain a field which serves as the unique key. This key is used in the returned
-    response to assoicate an analysis breakdown to the analyzed document.
-
-    Like the FieldAnalysisRequestHandler, this handler also supports query analysis by
-    sending either an "analysis.query" or "q" request paraemter that holds the query text to be analyized. It also
-    supports the "analysis.showmatch" parameter which when set to true, all field tokens that match the query
-    tokens will be marked as a "match".
-  -->
-  <requestHandler name="/analysis/document" class="solr.DocumentAnalysisRequestHandler"/>
-  <!--
-    RequestHandler that provides much the same functionality as analysis.jsp. Provides the ability
-    to specify multiple field types and field names in the same request and outputs index-time and
-    query-time analysis for each of them.
-
-    Request parameters are:
-    analysis.fieldname - The field name whose analyzers are to be used
-    analysis.fieldtype - The field type whose analyzers are to be used
-    analysis.fieldvalue - The text for index-time analysis
-    q (or analysis.q) - The text for query time analysis
-    analysis.showmatch (true|false) - When set to true and when query analysis is performed, the produced
-                                      tokens of the field value analysis will be marked as "matched" for every
-                                      token that is produces by the query analysis
-   -->
-  <requestHandler name="/analysis/field" class="solr.FieldAnalysisRequestHandler"/>
-  <!-- CSV update handler, loaded on demand -->
-  <requestHandler name="/update/csv" class="solr.CSVRequestHandler" startup="lazy"/>
-  <!-- 
-   Admin Handlers - This will register all the standard admin RequestHandlers.  Adding 
-   this single handler is equivalent to registering:
-   
-  <requestHandler name="/admin/luke"       class="org.apache.solr.handler.admin.LukeRequestHandler" />
-  <requestHandler name="/admin/system"     class="org.apache.solr.handler.admin.SystemInfoHandler" />
-  <requestHandler name="/admin/plugins"    class="org.apache.solr.handler.admin.PluginInfoHandler" />
-  <requestHandler name="/admin/threads"    class="org.apache.solr.handler.admin.ThreadDumpHandler" />
-  <requestHandler name="/admin/properties" class="org.apache.solr.handler.admin.PropertiesRequestHandler" />
-  <requestHandler name="/admin/file"       class="org.apache.solr.handler.admin.ShowFileRequestHandler" >
-  
-  If you wish to hide files under ${solr.home}/conf, explicitly register the ShowFileRequestHandler using:
-  <requestHandler name="/admin/file" class="org.apache.solr.handler.admin.ShowFileRequestHandler" >
-    <lst name="invariants">
-     <str name="hidden">synonyms.txt</str> 
-     <str name="hidden">anotherfile.txt</str> 
-    </lst>
-  </requestHandler>
-  -->
-  <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers"/>
-  <!-- ping/healthcheck -->
-  <requestHandler name="/admin/ping" class="PingRequestHandler">
-    <lst name="defaults">
-      <str name="qt">standard</str>
-      <str name="q">solrpingquery</str>
-      <str name="echoParams">all</str>
-    </lst>
-  </requestHandler>
-  <!-- Echo the request contents back to the client -->
-  <requestHandler name="/debug/dump" class="solr.DumpRequestHandler">
-    <lst name="defaults">
-      <str name="echoParams">explicit</str>
-      <!-- for all params (including the default etc) use: 'all' -->
-      <str name="echoHandler">true</str>
-    </lst>
-  </requestHandler>
-  <highlighting>
-    <!-- Configure the standard fragmenter -->
-    <!-- This could most likely be commented out in the "default" case -->
-    <fragmenter name="gap" class="org.apache.solr.highlight.GapFragmenter" default="true">
-      <lst name="defaults">
-        <int name="hl.fragsize">100</int>
-      </lst>
-    </fragmenter>
-    <!-- A regular-expression-based fragmenter (f.i., for sentence extraction) -->
-    <fragmenter name="regex" class="org.apache.solr.highlight.RegexFragmenter">
-      <lst name="defaults">
-        <!-- slightly smaller fragsizes work better because of slop -->
-        <int name="hl.fragsize">70</int>
-        <!-- allow 50% slop on fragment sizes -->
-        <float name="hl.regex.slop">0.5</float>
-        <!-- a basic sentence pattern -->
-        <str name="hl.regex.pattern">[-\w ,/\n\"']{20,200}</str>
-      </lst>
-    </fragmenter>
-    <!-- Configure the standard formatter -->
-    <formatter name="html" class="org.apache.solr.highlight.HtmlFormatter" default="true">
-      <lst name="defaults">
-        <str name="hl.simple.pre"><![CDATA[<em>]]></str>
-        <str name="hl.simple.post"><![CDATA[</em>]]></str>
-      </lst>
-    </formatter>
-  </highlighting>
-  <!-- An example dedup update processor that creates the "id" field on the fly
-       based on the hash code of some other fields.  This example has overwriteDupes
-       set to false since we are using the id field as the signatureField and Solr
-       will maintain uniqueness based on that anyway. 
-       
-       You have to link the chain to an update handler above to use it ie:
-         <requestHandler name="/update "class="solr.XmlUpdateRequestHandler">
-           <lst name="defaults">
-             <str name="update.processor">dedupe</str>
-           </lst>
-         </requestHandler>  
-  -->
-  <!--
-  <updateRequestProcessorChain name="dedupe">
-    <processor class="org.apache.solr.update.processor.SignatureUpdateProcessorFactory">
-      <bool name="enabled">true</bool>
-      <str name="signatureField">id</str>
-      <bool name="overwriteDupes">false</bool>
-      <str name="fields">name,features,cat</str>
-      <str name="signatureClass">org.apache.solr.update.processor.Lookup3Signature</str>
-    </processor>
-    <processor class="solr.LogUpdateProcessorFactory" />
-    <processor class="solr.RunUpdateProcessorFactory" />
-  </updateRequestProcessorChain>
-  -->
-  <!-- queryResponseWriter plugins... query responses will be written using the
-    writer specified by the 'wt' request parameter matching the name of a registered
-    writer.
-    The "default" writer is the default and will be used if 'wt' is not specified 
-    in the request. XMLResponseWriter will be used if nothing is specified here.
-    The json, python, and ruby writers are also available by default.
-
-    <queryResponseWriter name="xml" class="org.apache.solr.request.XMLResponseWriter" default="true"/>
-    <queryResponseWriter name="json" class="org.apache.solr.request.JSONResponseWriter"/>
-    <queryResponseWriter name="python" class="org.apache.solr.request.PythonResponseWriter"/>
-    <queryResponseWriter name="ruby" class="org.apache.solr.request.RubyResponseWriter"/>
-    <queryResponseWriter name="php" class="org.apache.solr.request.PHPResponseWriter"/>
-    <queryResponseWriter name="phps" class="org.apache.solr.request.PHPSerializedResponseWriter"/>
-
-    <queryResponseWriter name="custom" class="com.example.MyResponseWriter"/>
-  -->
-  <!-- XSLT response writer transforms the XML output by any xslt file found
-       in Solr's conf/xslt directory.  Changes to xslt files are checked for
-       every xsltCacheLifetimeSeconds.  
-   -->
-  <queryResponseWriter name="xslt" class="org.apache.solr.request.XSLTResponseWriter">
-    <int name="xsltCacheLifetimeSeconds">5</int>
-  </queryResponseWriter>
-  <!-- example of registering a query parser
-  <queryParser name="lucene" class="org.apache.solr.search.LuceneQParserPlugin"/>
-  -->
-  <!-- example of registering a custom function parser 
-  <valueSourceParser name="myfunc" class="com.mycompany.MyValueSourceParser" />
-  -->
-  <!-- config for the admin interface -->
-  <admin>
-    <defaultQuery>solr</defaultQuery>
-    <!-- configure a healthcheck file for servers behind a loadbalancer
-    <healthcheck type="file">server-enabled</healthcheck>
-    -->
-  </admin>
-  <requestHandler class="solr.MoreLikeThisHandler" name="/mlt">
-    <lst name="defaults">
-      <str name="mlt.mintf">1</str>
-      <str name="mlt.mindf">2</str>
-    </lst>
-  </requestHandler>
-</config>

solr/conf/spellings.txt

@@ -1,2 +0,0 @@
-pizza
-history

solr/conf/stopwords.txt

@@ -1,58 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#-----------------------------------------------------------------------
-# a couple of test stopwords to test that the words are really being
-# configured from this file:
-stopworda
-stopwordb
-
-#Standard english stop words taken from Lucene's StopAnalyzer
-a
-an
-and
-are
-as
-at
-be
-but
-by
-for
-if
-in
-into
-is
-it
-no
-not
-of
-on
-or
-s
-such
-t
-that
-the
-their
-then
-there
-these
-they
-this
-to
-was
-will
-with
-

solr/conf/synonyms.txt

@@ -1,31 +0,0 @@
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#-----------------------------------------------------------------------
-#some test synonym mappings unlikely to appear in real input text
-aaa => aaaa
-bbb => bbbb1 bbbb2
-ccc => cccc1,cccc2
-a\=>a => b\=>b
-a\,a => b\,b
-fooaaa,baraaa,bazaaa
-
-# Some synonym groups specific to this example
-GB,gib,gigabyte,gigabytes
-MB,mib,megabyte,megabytes
-Television, Televisions, TV, TVs
-#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming
-#after us won't split it into two words.
-
-# Synonym mappings can be used for spelling correction too
-pixima => pixma
-

vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_versions_controller.rb

@@ -0,0 +1,12 @@
+class Panel::Announcement::BackEnd::BulletinVersionsController < OrbitBackendController
+  include OrbitControllerLib::DivisionForDisable
+
+  def index
+    @bulletin = Bulletin.find(params[:bulletin_id])
+  end
+
+  def show
+    @bulletin = Bulletin.find(params[:bulletin_id])
+    @version = @bulletin.versions.where(version: params[:id]).first
+  end
+end

vendor/built_in_modules/announcement/app/models/bulletin.rb

@@ -6,6 +6,7 @@ class Bulletin
   include Mongoid::MultiParameterAttributes
   include Sunspot::Mongo
   include Impressionist::Impressionable
+  include Mongoid::Versioning
 
   BelongsToCategory =  :bulletin_category
   include OrbitCoreLib::BelongsToCategoryMayDisable

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_versions/index.html.erb

@@ -0,0 +1,25 @@
+<table class="table main-list">
+	<thead>
+		<tr>
+			<th class="span7 select"><%= t(:name) %></th>
+			<th class="span1-2"><%= t(:version) %></th>
+			<th class="span1-2"><%= t(:update_at) %></th>
+			<th class="span1-2"><%= t(:last_modified) %></th>
+		</tr>
+	</thead>
+	<tbody>
+    <% @bulletin.versions.reverse.each do |version| %>
+		  <tr class="with_action">
+		  	<td>
+		  		<%= version.title %>
+		  		<div class="quick-edit">
+            <%= link_to '顯示', panel_announcement_back_end_bulletin_bulletin_version_path(@bulletin, version.version) %>
+		  		</div>
+		  	</td>
+		  	<td><%= version.version %></td>
+		  	<td><%= display_date(version.updated_at) %></td>
+        <td><%= User.from_id(version.update_user_id).name rescue ''%></td>
+		  </tr>
+    <% end %>
+	</tbody>
+</table>

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_versions/show.html.erb

@@ -0,0 +1,33 @@
+<ul>
+	<li>
+		<b><%= t(:name) %></b>
+		<%= @version.title %>
+	</li>
+	<li>
+		<b><%= t(:subtitle) %></b>
+		<%= @version.subtitle %>
+	</li>
+  <li>
+    <b><%= t(:text) %></b>
+    <%= simple_format @version.text %>
+  </li>
+  <li>
+    <b><%= t(:deadline) %></b>
+    <%= display_date(@version.deadline) if @version.deadline  %>
+  </li>
+  <li>
+    <b><%= t(:postdate) %></b>
+    <%= display_date(@version.postdate) if @version.postdate  %>
+  </li>
+	<li>
+		<b><%= t(:posted_by) %></b>
+		<%= User.find(@version.create_user_id).name %>
+	</li>
+	<li>
+		<b><%= t(:last_modified) %></b>
+		<%= display_date(@version.updated_at) %>
+	</li>
+</ul>
+
+
+<%= link_back %>

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb

@@ -61,6 +61,7 @@
 			</ul>
 		</div>
 	</td>
+  <td><%= link_to bulletin.version, panel_announcement_back_end_bulletin_bulletin_versions_path(bulletin) %></td>
 	<td><%= display_date_time(bulletin.postdate) %></td>
 	<td><%= (bulletin.deadline) ? display_date_time(bulletin.deadline ): t(:no_deadline) %></td>
 	<td>

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.html.erb

@@ -7,6 +7,7 @@
 	    <th class="span1-2"></th>
 	    <th class="span1-2"></th>
 	    <th class="span1-2"></th>
+	    <th class="span1-2"></th>
 	    <th class="span1-3"></th>
 	</tr>
 </thead>

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb

@@ -2,6 +2,7 @@
 	 ['status', ['is_top', 'is_hot', 'is_hidden', 'is_pending', 'is_checked', 'is_rejected'], 'span1-2', :status],
 													['category', 'bulletin_category', 'span1-2', :category],
 													['title', 'title','span7', :title],
+                          ['version', 'version', 'span1-2', :version],
 													['start_date', 'postdate', 'span1-2', :start_date],
 													['end_date', 'deadline', 'span1-2', :end_date],
 													['tags', 'tags', 'span1-2', :tags],

vendor/built_in_modules/announcement/config/routes.rb

@@ -23,6 +23,8 @@ Rails.application.routes.draw do
           end
           match "file_quick_add/:bulletin_id" => "bulletins#file_quick_add" ,:as => :file_quick_add
           match "file_quick_edit/:bulletin_id" => "bulletins#file_quick_edit" ,:as => :file_quick_edit
+
+          resources :bulletin_versions
         end
 
         resources :bulletin_categorys do

vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb

@@ -7,12 +7,3 @@
 </div>
 
 <%= stylesheet_link_tag "archive/archives" %>
-
-
-
-
-
-
-
-
-

vendor/built_in_modules/ask/.gitignore

@@ -1,7 +0,0 @@
-.bundle/
-log/*.log
-pkg/
-test/dummy/db/*.sqlite3
-test/dummy/log/*.log
-test/dummy/tmp/
-test/dummy/.sass-cache

vendor/built_in_modules/ask/Gemfile

@@ -1,17 +0,0 @@
-source "http://rubygems.org"
-
-# Declare your gem's dependencies in ask.gemspec.
-# Bundler will treat runtime dependencies like base dependencies, and
-# development dependencies will be added by default to the :development group.
-gemspec
-
-# jquery-rails is used by the dummy application
-gem "jquery-rails"
-
-# Declare any dependencies that are still in development here instead of in
-# your gemspec. These might include edge Rails or gems from your path or
-# Git. Remember to move these dependencies to your gemspec before releasing
-# your gem to rubygems.org.
-
-# To use debugger
-# gem 'debugger'

vendor/built_in_modules/ask/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright 2013 YOURNAME
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

vendor/built_in_modules/ask/README.rdoc

@@ -1,3 +0,0 @@
-= Ask
-
-This project rocks and uses MIT-LICENSE.

vendor/built_in_modules/ask/Rakefile

@@ -1,38 +0,0 @@
-#!/usr/bin/env rake
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Ask'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-
-
-
-Bundler::GemHelper.install_tasks
-
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
-
-task :default => :test

vendor/built_in_modules/ask/app/controllers/application_controller.rb

@@ -1,23 +0,0 @@
-class ApplicationController < ActionController::Base
-  protect_from_forgery
-  before_filter :set_locale
-
-  # Set I18n.locale
-  def set_locale
-    # update session if passed
-    session[:locale] = params[:locale] if params[:locale]
-
-    # set locale based on session or default
-    begin
-      # check if locale is valid for non site pages
-      if !VALID_LOCALES.include?(session[:locale])
-        I18n.locale = I18n.default_locale
-      else
-        I18n.locale = session[:locale]
-      end
-    rescue
-      I18n.locale = I18n.default_locale
-    end
-  end
-
-end

vendor/built_in_modules/ask/app/controllers/panel/ask/back_end/ask_acknowledgements_controller.rb

@@ -1,21 +0,0 @@
-class Panel::Ask::BackEnd::AskAcknowledgementsController < OrbitBackendController
-  include AdminHelper
-  include OrbitControllerLib::DivisionForDisable
-
-  def initialize
-    super
-    @app_title = 'ask_acknowledgement'
-  end
-
-  def index
-    @ask_acknowledgement = AskAcknowledgement.first || AskAcknowledgement.create
-    @url = panel_ask_back_end_ask_acknowledgement_path(@ask_acknowledgement)
-  end
-
-  def update
-    @ask_acknowledgement = AskAcknowledgement.first
-    @ask_acknowledgement.update_attributes(params[:ask_acknowledgement])
-    redirect_to panel_ask_back_end_ask_acknowledgements_path, notice: t('ask.save_success')
-  end
-
-end

vendor/built_in_modules/ask/app/controllers/panel/ask/back_end/ask_admins_controller.rb

@@ -1,54 +0,0 @@
-class Panel::Ask::BackEnd::AskAdminsController < OrbitBackendController
-
-  include AdminHelper
-  include OrbitControllerLib::DivisionForDisable
-
-  def initialize
-    super
-    @app_title = 'ask_admins'
-  end
-
-  def index
-    @ask_admins = AskAdmin.all
-    @ask_admin = AskAdmin.new
-    @url = panel_ask_back_end_ask_admins_path
-  end
-
-  def create
-    @ask_admin = AskAdmin.new(params[:ask_admin])
-    @ask_admin.save
-
-    respond_to do |format|
-      format.js
-    end
-  end
-
-  def edit
-    @ask_admin = AskAdmin.find(params[:id])
-    @url = panel_ask_back_end_ask_admin_path(@ask_admin)
-
-    respond_to do |format|
-      format.js
-    end
-  end
-
-  def update
-    @ask_admin = AskAdmin.find(params[:id])
-    @url = panel_ask_back_end_ask_admin_path(@ask_admin)
-    @ask_admin.update_attributes(params[:ask_admin])
-
-    respond_to do |format|
-      format.js
-    end
-  end
-
-  def destroy
-    @ask_admin = AskAdmin.find(params[:id])
-    @ask_admin.destroy
-
-    respond_to do |format|
-      format.js
-    end
-  end
-
-end

vendor/built_in_modules/ask/app/controllers/panel/ask/back_end/ask_categories_controller.rb

@@ -1,55 +0,0 @@
-class Panel::Ask::BackEnd::AskCategoriesController < OrbitBackendController
-
-  include AdminHelper
-  include OrbitControllerLib::DivisionForDisable
-
-  def initialize
-    super
-    @app_title = 'ask_categories'
-  end
-
-  def index
-		@ask_categories = AskCategory.admin_manager_all
-		@ask_category = AskCategory.new
-    @url = panel_ask_back_end_ask_categories_path
-  end
-
-  def create
-    @ask_category = AskCategory.new(params[:ask_category])
-    @ask_category.save!
-
-    respond_to do |format|
-      format.js
-    end
-  end
-
-  def edit
-    @ask_category = AskCategory.find(params[:id])
-    @url = panel_ask_back_end_ask_category_path(@ask_category)
-
-    respond_to do |format|
-      format.js
-    end
-  end
-
-  def update
-    @ask_category = AskCategory.find(params[:id])
-    @url = panel_ask_back_end_ask_category_path(@ask_category)
-    @ask_category.update_attributes(params[:ask_category])
-
-    respond_to do |format|
-      format.js
-    end
-  end
-
-  def destroy
-    @ask_category = AskCategory.find(params[:id])
-    @ask_category.disable = !@ask_category.disable
-    @ask_category.save!
-
-    respond_to do |format|
-      format.js
-    end
-  end
-
-end

vendor/built_in_modules/ask/app/controllers/panel/ask/back_end/ask_questions_controller.rb

@@ -1,88 +0,0 @@
-require 'csv'
-
-class Panel::Ask::BackEnd::AskQuestionsController < OrbitBackendController
-
-  include AdminHelper
-  include OrbitControllerLib::DivisionForDisable
-
-  def initialize
-    super
-    @app_title = 'ask_questions'
-  end
-
-  def index
-    @ask_questions = (params[:sort]) ? get_sorted_and_filtered('ask_questions') : get_viewable('ask_questions')
-
-    respond_to do |format|
-      format.html
-      format.js
-    end
-  end
-
-  def edit
-    @ask_question = AskQuestion.find(params[:id])
-    @ask_reply = @ask_question.ask_reply
-    if @ask_reply
-      @url = panel_ask_back_end_ask_question_ask_reply_path(@ask_question, @ask_question.ask_reply)
-      @method = 'put'
-    else
-      @ask_reply = AskReply.new
-      @url = panel_ask_back_end_ask_question_ask_replies_path(@ask_question)
-      @method = 'post'
-    end
-  end
-
-  def destroy
-    @ask_question = AskQuestion.find(params[:id])
-    @ask_question.destroy
-
-    respond_to do |format|
-      format.js
-    end
-  end
-
-  def delete
-    if params[:ids]
-      ask_questions = AskQuestion.any_in(:_id => params[:ids]).destroy_all
-    end
-    redirect_to panel_ask_back_end_ask_questions_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
-  end
-
-  def export
-
-  end
-
-  def do_export
-    Rails.application.config.mongoid.use_activesupport_time_zone = true
-    date_start = "#{params[:export]['start(1i)']}-#{params[:export]['start(2i)']}-#{params[:export]['start(3i)']}"
-    date_end = "#{params[:export]['end(1i)']}-#{params[:export]['end(2i)']}-#{params[:export]['end(3i)']}"
-    @ask_questions = AskQuestion.includes(:ask_category).includes(:ask_reply).where(:created_at.gte => date_start, :created_at.lte => date_end)
-
-    csv = CSV.generate do |csv|
-      csv << [ t('category'),
-               AskQuestion.human_attribute_name(:name),
-               AskQuestion.human_attribute_name(:identity),
-               AskQuestion.human_attribute_name(:email),
-               AskQuestion.human_attribute_name(:phone),
-               AskQuestion.human_attribute_name(:tax),
-               AskQuestion.human_attribute_name(:title),
-               AskQuestion.human_attribute_name(:content),
-               AskReply.human_attribute_name(:content),
-               AskReply.human_attribute_name(:comment)]
-      @ask_questions.each do |ask_question|
-        ask_question.ask_reply ||= AskReply.new
-        csv << [ ask_question.ask_category.name,
-                 ask_question.name,
-                 ask_question.identity,
-                 ask_question.email,
-                 ask_question.phone,
-                 ask_question.tax,
-                 ask_question.title,
-                 ask_question.content,
-                 ask_question.ask_reply.content,
-                 ask_question.ask_reply.comment ]
-      end
-    end
-    send_data csv.encode('Big5'), type: 'text/csv',  filename: "Questions-#{date_start}-#{date_end}.csv"
-  end
-end

vendor/built_in_modules/ask/app/controllers/panel/ask/back_end/ask_replies_controller.rb

@@ -1,29 +0,0 @@
-class Panel::Ask::BackEnd::AskRepliesController < OrbitBackendController
-
-  include AdminHelper
-  include OrbitControllerLib::DivisionForDisable
-
-  def initialize
-    super
-    @app_title = 'ask_replies'
-  end
-
-  def create
-    @ask_question = AskQuestion.find(params[:ask_question_id])
-    @ask_question.ask_reply = AskReply.new(params[:ask_reply])
-    @ask_question.save
-    if @ask_question.ask_reply.send_email?
-      Resque.enqueue(SendAskReplyMail, @ask_reply.ask_question.id)
-    end
-    redirect_to panel_ask_back_end_ask_questions_path, notice: t('ask.reply_success')
-  end
-
-  def update
-    @ask_reply = AskReply.find(params[:id])
-    @ask_reply.update_attributes(params[:ask_reply])
-    if @ask_reply.send_email?
-      Resque.enqueue(SendAskReplyMail, @ask_reply.ask_question.id)
-    end
-    redirect_to panel_ask_back_end_ask_questions_path, notice: t('ask.reply_success')
-  end
-end

vendor/built_in_modules/ask/app/controllers/panel/ask/front_end/ask_questions_controller.rb

@@ -1,28 +0,0 @@
-class Panel::Ask::FrontEnd::AskQuestionsController < OrbitWidgetController
-
-  layout false
-
-  def initialize
-    super
-    @app_title = 'ask'
-  end
-
-  def index
-    @ask_question = AskQuestion.new
-  end
-
-  def create
-    @ask_question = AskQuestion.new(params[:ask_question])
-    if verify_recaptcha model: @ask_question,  private_key: '6Lfl7OESAAAAAD4rl5S16-zjt5yiKNYJ6jsqdwmL'
-      @ask_acknowledgement = AskAcknowledgement.first || AskAcknowlegement.new
-      @ask_question.save
-      AskAdmin.all.each do |ask_admin|
-        Resque.enqueue(SendAskNoticeMail, ask_admin.id, @ask_question.id)
-      end
-    end
-    respond_to do |format|
-      format.js
-    end
-  end
-
-end

vendor/built_in_modules/ask/app/mailers/ask_mailer.rb

@@ -1,14 +0,0 @@
-class AskMailer < ActionMailer::Base
-  default from: 'orbit_test@rulingcom.com'
-
-  def reply(ask_question)
-    @ask_question = ask_question
-    mail(:to => @ask_question.email, :subject => "#{t('ask.reply')}:#{@ask_question.title}")
-  end
-
-  def notice(ask_admin, ask_question)
-    @ask_admin = ask_admin
-    @ask_question = ask_question
-    mail(:to => @ask_admin.email, :subject => "#{t('ask.new_question')}:#{@ask_question.title}")
-  end
-end

vendor/built_in_modules/ask/app/models/ask_acknowledgement.rb

@@ -1,6 +0,0 @@
-class AskAcknowledgement
-  include Mongoid::Document
-  include Mongoid::Timestamps
-
-  field :content, type: String
-end

vendor/built_in_modules/ask/app/models/ask_admin.rb

@@ -1,6 +0,0 @@
-class AskAdmin
-  include Mongoid::Document
-  include Mongoid::Timestamps
-
-  field :email, type: String
-end

vendor/built_in_modules/ask/app/models/ask_category.rb

@@ -1,10 +0,0 @@
-class AskCategory
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  include OrbitCoreLib::ObjectDisable
-
-  field :name, localize: true
-  field :key
-
-  has_many :ask_questions
-end

vendor/built_in_modules/ask/app/models/ask_question.rb

@@ -1,18 +0,0 @@
-class AskQuestion
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  include OrbitCoreLib::ObjectDisable
-
-  field :name, type: String
-  field :identity, type: String
-  field :email, type: String
-  field :phone, type: String
-  field :tax, type: String
-  field :title, type: String
-  field :content, type: String
-
-  validates_presence_of :name, :identity, :email, :title, :content
-
-  belongs_to :ask_category
-  has_one :ask_reply, dependent: :destroy
-end

vendor/built_in_modules/ask/app/models/ask_reply.rb

@@ -1,11 +0,0 @@
-class AskReply
-  include Mongoid::Document
-  include Mongoid::Timestamps
-
-  field :content, type: String
-  field :comment, type: String
-  field :status, type: String
-  field :send_email, type: Boolean, detault: false
-
-  belongs_to :ask_question
-end

vendor/built_in_modules/ask/app/views/ask_mailer/notice.html.erb

@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-</head>
-<body>
-  <h1><%= @ask_question.title %></h1>
-  <table>
-    <tr>
-      <td><%= AskQuestion.human_attribute_name(:name) %>：</td>
-      <td><%= @ask_question.name %></td>
-    </tr>
-    <tr>
-      <td><%= AskQuestion.human_attribute_name(:identity) %>：</td>
-      <td><%= @ask_question.identity %></td>
-    </tr>
-    <tr>
-      <td><%= AskQuestion.human_attribute_name(:email) %>：</td>
-      <td><%= @ask_question.email %></td>
-    </tr>
-    <tr>
-      <td><%= AskQuestion.human_attribute_name(:phone) %>：</td>
-      <td><%= @ask_question.phone %></td>
-    </tr>
-    <tr>
-      <td><%= AskQuestion.human_attribute_name(:tax) %>：</td>
-      <td><%= @ask_question.tax %></td>
-    </tr>
-    <tr>
-      <td><%= AskQuestion.human_attribute_name(:content) %>：</td>
-      <td><%= @ask_question.content %></td>
-    </tr>
-  </table>
-  <p>此為系統自動發信，請勿直接回覆</p>
-</body>
-</html>

vendor/built_in_modules/ask/app/views/ask_mailer/reply.html.erb

@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
-  </head>
-  <body>
-    <p>
-      <%= @ask_question.ask_reply.content %>
-    </p>
-    <p>此為系統自動發信，請勿直接回覆</p>
-  </body>
-</html>

vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_acknowledgements/index.html.erb

@@ -1,14 +0,0 @@
-<div id="ask-acknowledgement">
-  <%= form_for @ask_acknowledgement, url:  @url, html: { class: 'form-horizontal' } do |f| %>
-    <div class="control-group">
-      <%= f.label :content, t('ask.acknowledgement'), class: 'control-label' %>
-      <div class="controls">
-        <%= f.text_area :content, rows: 10 %>
-      </div>
-    </div>
-    <div class="form-actions">
-      <%= f.submit t('submit'), class: 'btn btn-primary' %>
-      <%= f.button t('cancel'), type: 'reset', class: 'btn' %>
-    </div>
-  <% end %>
-</div>

vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_admins/_ask_admin.html.erb

@@ -1,13 +0,0 @@
-<tr id="<%= dom_id ask_admin %>" class="with_action">
-  <td>
-    <%= ask_admin.email %>
-    <%if at_least_module_manager %>
-      <div class="quick-edit">
-      <ul class="nav nav-pills hide">
-        <li><%= link_to t(:edit), edit_panel_ask_back_end_ask_admin_path(ask_admin), :remote => true %></li>
-        <li><%= link_to t(:delete), panel_ask_back_end_ask_admin_path(ask_admin), :confirm => t(:sure?), :method => :delete, :remote => true ,:class=> "archive_toggle"%></li>
-      </ul>
-    </div>
-  <% end -%>
-  </td>
-</tr>

vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_admins/_form.html.erb

@@ -1,19 +0,0 @@
-<%= form_for(@ask_admin, :remote => true, :url => @url) do |f| %>
-
-	<h2><%= @ask_admin.new_record? ? t(:add) : t(:edit) %></h2>
-
-	<div id="widget-title">
-		<div class="control-group">
-			<%= f.label :email, class: 'control-label' %>
-			<div class="controls">
-				<%= f.text_field :email, class: 'input-xxlarge' %>
-			</div>
-		</div>
-	</div>
-
-  <div class="form-actions">
-    <%= f.submit t(:submit), class: 'btn btn-primary' %>
-  </div>
-
-<% end %>
-

vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_admins/create.js.erb

@@ -1,2 +0,0 @@
-$('<%= j render :partial => 'ask_admin', :collection => [@ask_admin] %>').appendTo('#ask-admins').hide().fadeIn();
-$("#new_ask_admin")[0].reset();

vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_admins/destroy.js.erb

@@ -1 +0,0 @@
-$("#<%= dom_id @ask_admin %>").fadeOut();

vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_admins/edit.js.erb

@@ -1 +0,0 @@
-$("#form > form").replaceWith("<%= j render "form" %>");

vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_admins/index.html.erb

@@ -1,23 +0,0 @@
-<%= flash_messages %>
-<div id="filter" class="subnav">
-  <div class="filters">
-    <div id="sort_headers" class="table-label">
-      <table class="table main-list">
-        <thead>
-          <tr>
-            <th class="span1-2"><%= t(:email) %></th>
-          </tr>
-        </thead>
-      </table>
-    </div>
-  </div>
-</div>
-
-<table id="ask-admins" class="table main-list">
-  <tbody class="sort-holder">
-    <%= render :partial => 'ask_admin', :collection => @ask_admins %>
-  </tbody>
-</table>
-
-<div id="form"><%= render :partial => "form"  if at_least_module_manager%></div>
-

vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_admins/update.js.erb

@@ -1,4 +0,0 @@
-$("#<%= dom_id @ask_admin %>").replaceWith("<%= j render :partial => 'ask_admin', :collection => [@ask_admin] %>");
-<% @ask_admin = AskAdmin.new(:display => 'List') # reset for new form %>
-$(".edit_ask_admin").replaceWith("<%= j render "form" %>")
-$(".new_ask_admin")[0].reset();

vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_categories/_ask_category.html.erb

@@ -1,17 +0,0 @@
-<tr id="<%= dom_id ask_category %>" class="with_action">
-  <td>
-    <%= ask_category.key %>
-    <%if at_least_module_manager %>
-      <div class="quick-edit">
-      <ul class="nav nav-pills hide">
-        <li><%= link_to t(:edit), edit_panel_ask_back_end_ask_category_path(ask_category), :remote => true %></li>
-        <li><%= link_to   show_toggle_archive_btn(ask_category), panel_ask_back_end_ask_category_path(ask_category), :confirm => t(:sure?), :method => :delete, :remote => true ,:class=> "archive_toggle"%></li>
-        <li><%#= show_ask_permission_link ask_category %></li>
-      </ul>
-    </div>
-  <% end -%>
-  </td>
-  <% @site_valid_locales.each do |locale| %>
-    <td><%= ask_category.name_translations[locale] rescue nil %></td>
-  <% end %>
-</tr>

vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_categories/_form.html.erb

@@ -1,28 +0,0 @@
-<%= form_for(@ask_category, :remote => true, :url => @url) do |f| %>
-
-	<h2><%= (@ask_category.new_record? ? t(:add) : t(:edit)) %></h2>
-
-	<div id="widget-title">
-		<%= f.label :key, t(:key) %>
-		<%= f.text_field :key %>
-	</div>
-
-	<div id="widget-title">
-		<%= f.fields_for :name_translations do |f| %>
-		  <% @site_valid_locales.each do |locale| %>
-				<div class="control-group">
-					<%= label_tag "name-#{locale}", "#{t(:name)}-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
-					<div class="controls">
-						<%= f.text_field locale, :class => 'input-xxlarge', :value => (@ask_category.name_translations[locale] rescue nil) %>
-					</div>
-				</div>
-		  <% end %>
-		<% end %>
-	</div>
-
-  <div class="form-actions">
-    <%= f.submit t(:submit), :class=>'btn btn-primary' %>
-  </div>
-
-<% end %>
-

vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_categories/create.js.erb

@@ -1,2 +0,0 @@
-$('<%= j render :partial => 'ask_category', :collection => [@ask_category] %>').appendTo('#ask_categories').hide().fadeIn();
-$("#new_ask_category")[0].reset();

vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_categories/destroy.js.erb

@@ -1 +0,0 @@
-$("#<%= dom_id @ask_category %>").find(".archive_toggle").text("<%= show_toggle_archive_btn(@ask_category) %>  ");

vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_categories/edit.js.erb

@@ -1 +0,0 @@
-$("#form > form").replaceWith("<%= j render "form" %>");

vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_categories/index.html.erb

@@ -1,34 +0,0 @@
-<%= flash_messages %>
-<div id="filter" class="subnav">
-  <div class="filters">
-    <div id="sort_headers" class="table-label">
-      <table class="table main-list">
-        <thead>
-          <tr>
-            <th class="span1-2"><%= t(:key) %></th>
-            <% %w[服務 Service].each do |name| %>
-              <th class="span1-2"><%= name %></th>
-            <% end %>
-          </tr>
-        </thead>
-      </table>
-    </div>
-  </div>
-</div>
-
-<table id="ask_categories" class="table main-list">
-  <thead>
-    <tr>
-      <th class="span1-2"></th>
-      <% @site_valid_locales.each do |locale| %>
-        <th class="span1-2"></th>
-    <% end %>
-    </tr>
-  </thead>
-  <tbody class="sort-holder">
-    <%= render :partial => 'ask_category', :collection => @ask_categories %>
-  </tbody>
-</table>
-
-<div id="form"><%= render :partial => "form"  if at_least_module_manager%></div>
-

vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_categories/update.js.erb

@@ -1,4 +0,0 @@
-$("#<%= dom_id @ask_category %>").replaceWith("<%= j render :partial => 'ask_category', :collection => [@ask_category] %>");
-<% @ask_category = QaCategory.new(:display => 'List') # reset for new form %>
-$(".edit_ask_category").replaceWith("<%= j render "form" %>")
-$(".new_ask_category")[0].reset();

vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_questions/_ask_question.html.erb

@@ -1,29 +0,0 @@
-<tr id="<%= dom_id ask_question %>" class="with_action">
-  <td>
-    <%= check_box_tag 'to_delete[]', ask_question.id, false, :class => "checkbox_in_list" %>
-  </td>
-  <td>
-    <%= ask_question.ask_reply ? ask_question.ask_reply.status : t('ask.pending') %>
-  </td>
-  <td>
-    <%= ask_question.ask_category.name %>
-  </td>
-  <td>
-    <%= ask_question.title %>
-	  <div class="quick-edit">
-	  	<ul class="nav nav-pills hide">
-	  		<%if at_least_module_manager || ask_question.ask_category.cur_user_is_sub_manager_of(:edit)%>
-	  		<li><%= link_to t('edit'), edit_panel_ask_back_end_ask_question_path(ask_question, :page => params[:page]) %></li>
-	  		<li><%= link_to t(:delete_), panel_ask_back_end_ask_question_path(ask_question), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
-	  		<% end -%>
-	  	</ul>
-	  </div>
-  </td>
-  <td>
-    <%= ask_question.name %>
-  </td>
-  <td>
-    <%= ask_question.created_at.strftime "%Y-%m-%d %H:%M:%S" %>
-  </td>
-</tr>
-

vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_questions/_filter.html.erb

@@ -1,11 +0,0 @@
-<div id='filter' class="subnav">
-  <div class="filters accordion-group">
-    <div id="sort_headers" class="table-label">
-      <%= render 'sort_headers' %>
-    </div>
-  </div>
-</div>
-
-<% content_for :page_specific_javascript do %>
-  <%= javascript_include_tag 'sort_header' %>
-<% end %>

vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_questions/_sort_headers.html.erb

@@ -1,6 +0,0 @@
-<%= render_sort_bar(true, delete_panel_ask_back_end_ask_questions_path(direction: params[:direction], sort: params[:sort], sort_options: params[:sort_options]),
-  ['status', 'ask_reply.status','span1', :status],
-  ['ask_category', 'ask_category','span1', :category],
-  ['title', 'title','span3', :title],
-  ['name', 'name','span1', 'mongoid.attributes.ask_question.name'],
-  ['created_at', 'created_at','span1', 'mongoid.attributes.ask_question.created_at']).html_safe %>