From 983d9efe76e30cd785bd05059b320b5217255d49 Mon Sep 17 00:00:00 2001 From: Mark Robert Miller Date: Mon, 20 Jul 2015 13:52:10 +0000 Subject: [PATCH] SOLR-7810: map-reduce contrib script to set classpath for convenience refers to example rather than server. git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1691946 13f79535-47bb-0310-9956-ffa450edef68 --- solr/CHANGES.txt | 3 +++ solr/server/scripts/map-reduce/set-map-reduce-classpath.sh | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 3b11623e967..0024f3bb7fc 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -236,6 +236,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 ---------------------- diff --git a/solr/server/scripts/map-reduce/set-map-reduce-classpath.sh b/solr/server/scripts/map-reduce/set-map-reduce-classpath.sh index c430570e7c8..14d822c0463 100755 --- a/solr/server/scripts/map-reduce/set-map-reduce-classpath.sh +++ b/solr/server/scripts/map-reduce/set-map-reduce-classpath.sh @@ -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-reduce/lib"` 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