remove orcid-solr-web and references to it and update devsetup docs

DEVSETUP.md

@@ -120,7 +120,7 @@ These instructions are for Spring Tool Suite for Eclipse.
 
 * Select Configure (at the bottom) -> Select "Convert to Maven Project"
 
-* In package Explorer Right click on ORCID-Sourc 
+* In package Explorer Right click on ORCID-Source 
 
 * Select Import -> "Existing Maven Projects"
 
@@ -170,7 +170,7 @@ Do this before the '-vmargs' param
 
 * In VM Arguments add the following (changing the /Users/rcpeters/git/ORCID-Source path to your repo checkout)
 
-        -Dsolr.solr.home=/Users/rcpeters/git/ORCID-Source/orcid-solr-web/src/main/webapp/solr -Dorg.orcid.config.file=classpath:staging-persistence.properties -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true -XX:MaxPermSize=1024m -Dcom.mailgun.testmode=no -Dorg.orcid.message-listener.properties=classpath:message-listener.properties -Dorg.orcid.message-listener.development_mode=true -Dorg.orcid.activemq.config.file=classpath:orcid-activemq.properties
+         -Dorg.orcid.config.file=classpath:staging-persistence.properties -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true -XX:MaxPermSize=1024m -Dcom.mailgun.testmode=no -Dorg.orcid.message-listener.properties=classpath:message-listener.properties -Dorg.orcid.message-listener.development_mode=true -Dorg.orcid.activemq.config.file=classpath:orcid-activemq.properties
 
 * Click Ok
 
@@ -186,7 +186,7 @@ Do this before the '-vmargs' param
 
 * Right click on "Apache Tomcat Server".
 
-* Select "Add and Remove" Add orcid-api-web, orcid-pub-web, orcid-scheduler-web, orcid-solr-web and orcid-web
+* Select "Add and Remove" Add orcid-api-web, orcid-pub-web, orcid-scheduler-web and orcid-web
 
 ### Setting up Eclipse to use ORCID formatting rules
 
@@ -256,7 +256,7 @@ When this it is done, restart the server.
 
 * In VM Arguments add the following (changing org.orcid.persistence.path to the path to the directory you created above):
 
-        -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true -XX:MaxPermSize=1024m -Dcom.mailgun.testmode=no -Dorg.orcid.message-listener.properties=classpath:message-listener.properties -Dorg.orcid.message-listener.development_mode=true -Dorg.orcid.activemq.config.file=classpath:orcid-activemq.properties -Dorg.orcid.persistence.solr.url=http://localhost:8080/orcid-solr-web -Dorg.orcid.persistence.solr.read.only.url=http://localhost:8080/orcid-solr-web -Dorg.orcid.persistence.messaging.enabled=true -Dorg.orcid.persistence.path="/Users/rcpeters/git/mq"
+        -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true -XX:MaxPermSize=1024m -Dcom.mailgun.testmode=no -Dorg.orcid.message-listener.properties=classpath:message-listener.properties -Dorg.orcid.message-listener.development_mode=true -Dorg.orcid.activemq.config.file=classpath:orcid-activemq.properties -Dorg.orcid.persistence.messaging.enabled=true -Dorg.orcid.persistence.path="/Users/rcpeters/git/mq"
 
 * Click Ok
 
@@ -270,16 +270,35 @@ When this it is done, restart the server.
 
 * In the Servers tab, right click on "Message Listener" and click Start.
 
-### Configure frontend (Angular2)
+## Configure SOLR
+A local SOLR server is needed in order to test search functionality locally. SOLR includes its own development environment, which runs separately from the Tomact servers you created in Eclipse. 
+
+To install and configure SOLR locally, follow the steps in solr-config/README.md (https://github.com/ORCID/ORCID-Source/tree/master/solr-config)
+
+Optionally, you can connect your local environment to the QA SOLR instance by adding these to your VM Arguments
+
+* Double Click "Apache Tomcat Server"
+
+* Select Open launch configuration
+
+* Select Arguments 
+
+* In VM Arguments add the following to the existing list of arguments (don't delete the existing args!). Get the current QA SOLR machine from another developer.
+
+         -Dorg.orcid.persistence.solr.url=http://[QA SOLR machine]/qa/solr -Dorg.orcid.persistence.solr.read.only.url=http://[QA SOLR machine]/qa/solr  
+
+* Click Ok
+
+
+## Configure frontend (Angular)
 
 Follow next instructions in order to generate the core javascript file.
 
 See [How to produce angular_orcid_generated.js](https://github.com/ORCID/ORCID-Source/blob/master/orcid-nodejs/README.md). 
 For background about webpack see [Webpack setup](https://github.com/ORCID/ORCID-Source/tree/master/orcid-web/src/main/webapp/static/javascript)
 .
 
-
-### Testing your set up
+## Test your setup
 
 * Right click on "Apache Tomcat Server"
 
@@ -289,7 +308,6 @@ For background about webpack see [Webpack setup](https://github.com/ORCID/ORCID-
 
 * You should see a login page.
 
-* Click OK.
 
 ## Updating
 

TESTAUTO.md

@@ -40,7 +40,7 @@ The default test data is in the following config files:
 
 5. Click Apply, then click Run
 
-####Command Line
+#### Command Line
 
 1. Goto project directory
 
@@ -56,19 +56,19 @@ The default test data is in the following config files:
 
 This should setup the test data and then run a test that verifies the data was persisted in the database. If this process succeeds, run the blackbox test as follows.
 
-###Run the Blackbox tests
+### Run the Blackbox tests
 
 **Note:** Test data setup above must be run before each Blackbox test run, so that the data is in the correct state to start the Black box test.
 
-####Eclipse
+#### Eclipse
 
-1. Make sure that the following modules are added to Tomcat (stop Tomcat before adding modules):
+1. Make sure that SOLR is up and running on port 8983, per [solr-config/README.md](https://github.com/ORCID/ORCID-Source/blob/master/solr-config/README.md)
+2. Make sure that the following modules are added to Tomcat (stop Tomcat before adding modules):
 
         orcid-api-web
         orcid-internal-api
         orcid-pub-web
         orcid-scheduler-web
-        orcid-solr-web
         orcid-web
 
 2. Start Tomcat and wait for it to be up
@@ -93,7 +93,7 @@ This should setup the test data and then run a test that verifies the data was p
 
 7. Click Apply, then click Run
 
-####Command Line
+#### Command Line
 
 1. Goto project directory
 

orcid-activemq/src/main/resources/message-listener.properties

@@ -29,8 +29,8 @@ org.orcid.message-listener.api30BaseURI=https://localhost:8443/orcid-api-web/v3.
 
 org.orcid.core.indexPublicProfile=true
 
-org.orcid.persistence.solr.url=http://localhost:9876/solr
-org.orcid.persistence.solr.read.only.url=http://localhost:9876/solr
+org.orcid.persistence.solr.url=http://localhost:8983/solr
+org.orcid.persistence.solr.read.only.url=http://localhost:8983/solr
 org.orcid.listener.persistence.solr.socketTimeout=2000
 org.orcid.persistence.solr.connectionTimeout=1000
 org.orcid.persistence.solr.allowCompression=true

orcid-activities-indexer/src/test/resources/orcid-activities-indexer-test.properties

@@ -22,8 +22,8 @@ org.orcid.message-listener.api20BaseURI=https://localhost:8443/orcid-pub-web/v2.
 
 org.orcid.core.indexPublicProfile=false
 
-org.orcid.persistence.solr.url=http://localhost:8080/orcid-solr-web
-org.orcid.persistence.solr.read.only.url=http://localhost:8080/orcid-solr-web
+org.orcid.persistence.solr.url=http://localhost:8983/solr
+org.orcid.persistence.solr.read.only.url=http://localhost:8983/solr
 org.orcid.listener.persistence.solr.socketTimeout=2000
 org.orcid.persistence.solr.connectionTimeout=1000
 org.orcid.persistence.solr.allowCompression=true

orcid-message-listener/src/test/resources/orcid-message-listener-test.properties

@@ -25,8 +25,8 @@ org.orcid.message-listener.api30BaseURI=https://localhost:8443/orcid-pub-web/v3.
 
 org.orcid.core.indexPublicProfile=true
 
-org.orcid.persistence.solr.url=http://localhost:8080/orcid-solr-web
-org.orcid.persistence.solr.read.only.url=http://localhost:8080/orcid-solr-web
+org.orcid.persistence.solr.url=http://localhost:8983/solr
+org.orcid.persistence.solr.read.only.url=http://localhost:8983/solr
 org.orcid.listener.persistence.solr.socketTimeout=2000
 org.orcid.persistence.solr.connectionTimeout=1000
 org.orcid.persistence.solr.allowCompression=true

orcid-persistence/src/main/resources/staging-persistence.properties

@@ -85,8 +85,8 @@ org.orcid.persistence.statistics.db.readonly.testConnectionOnCheckin=true
 org.orcid.persistence.statistics.db.readonly.preferredTestQuery=select 1
 
 #Solr
-org.orcid.persistence.solr.url=http://localhost:8080/orcid-solr-web
-org.orcid.persistence.solr.read.only.url=http://localhost:8080/orcid-solr-web
+org.orcid.persistence.solr.url=http://localhost:8983/solr
+org.orcid.persistence.solr.read.only.url=http://localhost:8983/solr
 org.orcid.persistence.solr.socketTimeout=2000
 org.orcid.persistence.solr.connectionTimeout=1000
 org.orcid.persistence.solr.allowCompression=true