You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2015/07/20 15:53:58 UTC

svn commit: r1691947 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/CHANGES.txt solr/server/ solr/server/scripts/map-reduce/set-map-reduce-classpath.sh

Author: markrmiller
Date: Mon Jul 20 13:53:58 2015
New Revision: 1691947

URL: http://svn.apache.org/r1691947
Log:
SOLR-7810: map-reduce contrib script to set classpath for convenience refers to example rather than server.

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/solr/   (props changed)
    lucene/dev/branches/branch_5x/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/branch_5x/solr/server/   (props changed)
    lucene/dev/branches/branch_5x/solr/server/scripts/map-reduce/set-map-reduce-classpath.sh

Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1691947&r1=1691946&r2=1691947&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Mon Jul 20 13:53:58 2015
@@ -176,6 +176,9 @@ Bug Fixes
   a bug that resulted in filter cache lookup misses as well as the filter cache 
   exceeding it's configured size. (yonik)
 
+* SOLR-7810: map-reduce contrib script to set classpath for convenience refers to example
+  rather than server. (Mark Miller)
+
 Optimizations
 ----------------------
 

Modified: lucene/dev/branches/branch_5x/solr/server/scripts/map-reduce/set-map-reduce-classpath.sh
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/server/scripts/map-reduce/set-map-reduce-classpath.sh?rev=1691947&r1=1691946&r2=1691947&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/server/scripts/map-reduce/set-map-reduce-classpath.sh (original)
+++ lucene/dev/branches/branch_5x/solr/server/scripts/map-reduce/set-map-reduce-classpath.sh Mon Jul 20 13:53:58 2015
@@ -24,8 +24,8 @@ echo `absPath $solr_distrib`
 
 # extract war if necessary
 
-if [ ! -d "$solr_distrib/example/solr-webapp/webapp" ]; then
-   unzip -o $solr_distrib/example/webapps/solr.war -d $solr_distrib/example/solr-webapp/webapp
+if [ ! -d "$solr_distrib/server/solr-webapp/webapp" ]; then
+   unzip -o $solr_distrib/server/webapps/solr.war -d $solr_distrib/server/solr-webapp/webapp
 fi
 
 # Setup env variables for MapReduceIndexerTool
@@ -38,7 +38,7 @@ dir3=`absPath "$solr_distrib/contrib/map
 dir4=`absPath "$solr_distrib/contrib/morphlines-core/lib"`
 dir5=`absPath "$solr_distrib/contrib/morphlines-cell/lib"`
 dir6=`absPath "$solr_distrib/contrib/extraction/lib"`
-dir7=`absPath "$solr_distrib/example/solr-webapp/webapp/WEB-INF/lib"`
+dir7=`absPath "$solr_distrib/server/solr-webapp/webapp/WEB-INF/lib"`
 
 # Setup -libjar