Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

fixing conflicts from master

  • Loading branch information...
commit cc2e7e689a28a145a3fa254d33f68cc789759256 2 parents dde0131 + 577a8bc
Matt Mitchell mwmitchell authored

Showing 3 changed files with 26 additions and 11 deletions. Show diff stats Hide diff stats

  1. +5 8 CHANGES
  2. +20 2 README.rdoc
  3. +1 1  template.rb
13 CHANGES
@@ -6,7 +6,7 @@ NOTABLE CHANGES:
6 6
7 7 - Blacklight::SolrHelper #get_search_results and #get_solr_response_for_doc_id methods now return an array where the first object is a solr response hash and the second is a SolrDocument instance or array of SolrDocuments, thanks to Jonathan Rochkind.
8 8
9   - - bug fixed where template installer would continue to add the same lines to appliation_controller and application_helper if the template was executed more than once.
  9 + - bug fixed where template installer would continue to add the same lines to application_controller and application_helper if the template was executed more than once.
10 10
11 11 - Changed development solr port to 8983
12 12
@@ -21,6 +21,10 @@ NOTABLE CHANGES:
21 21
22 22 CHANGE LOG:
23 23
  24 +dde0131 updated template and readme for tag version
  25 +fd27ca3 updated CHANGES
  26 +1491010 updated version number to 2.4.1
  27 +bac8cbb notes about changes for v2.4.1
24 28 088c26a updated template and readme for tag version
25 29 392e17f updated template for 2.4
26 30 21d40dc changed comment
@@ -29,13 +33,6 @@ CHANGE LOG:
29 33 768e9d2 updated template for 2.4
30 34 440d291 Fixed issue CODEBASE-194
31 35 20ad46e updated development connection port to 8983
32   -=======
33   -8e7198f updated version number to 2.4.1
34   -dbf554f changed comment
35   -31552c6 updated tag version; removed branch variable
36   -ffce4c9 updated template and readme for tag version
37   -dc3c85f updated template for 2.4
38   ->>>>>>> updated CHANGES, which include everything from v2.4.0 to HEAD
39 36 673a566 added jira url
40 37 991017b updated formatting
41 38 d7dd1ee updated git info
22 README.rdoc
Source Rendered
@@ -22,8 +22,26 @@ Whichever method you choose for installation, be sure you have all the pre-requi
22 22 ===Installing Blacklight 2.4 (recommended):
23 23 rails ./blacklight-app -m http://github.com/projectblacklight/blacklight/raw/v2.4.1/template.rb
24 24
25   -==Installing the plugin into an existing rails app
26   -Instructions for installing the demo app are contained in the plugin's {README_INSTALLATION.rdoc}[http://github.com/projectblacklight/blacklight/blob/master/doc/README_INSTALLATION.rdoc]
  25 +=== Installing the "trunk", or master branch:
  26 + rails ./blacklight-app -m http://github.com/projectblacklight/blacklight/raw/master/template.rb
  27 +
  28 +After the installation process, make note of the instructions for starting Solr and indexing data. Blacklight depends on Solr so be sure it is running.
  29 +Start Solr
  30 +
  31 +The template will give you instructions on how to start Solr, copied here for convenience:
  32 +
  33 + cd jetty
  34 + java -jar start.jar
  35 +
  36 +This starts an instance of jetty with Solr running on port 8983. If you want to start on another port, use Java's -D argument:
  37 +
  38 + java -Djetty.port=8888 -jar start.jar
  39 +
  40 +Once you start it you can run your Rails app and it will use this SOLR index (expected on port 8983).
  41 +
  42 + ./script/server
  43 +
  44 +Now navigate to localhost:3000 and you should have a working demo blacklight application with the test data set!
27 45
28 46 ==Running solr
29 47 You'll also want some information about how Blacklight expects Apache SOLR ( http://lucene.apache.org/solr ) to run, which you can find in {README_SOLR.rdoc}[http://github.com/projectblacklight/blacklight/blob/master/doc/README_SOLR.rdoc]
2  template.rb
@@ -162,4 +162,4 @@ def modify_env_for_engines_boot!
162 162 puts "\n* You'll need to download a copy of solr."
163 163 end
164 164
165   -puts "\n* Blacklight installation complete!"
  165 +puts "\n* Blacklight installation complete!"

0 comments on commit cc2e7e6

Please sign in to comment.
Something went wrong with that request. Please try again.