BIGTOP-1079. bump version of Solr to 4.5.0
authorRoman Shaposhnik <rvs@cloudera.com>
Thu, 26 Sep 2013 17:03:42 +0000 (10:03 -0700)
committerRoman Shaposhnik <rvs@cloudera.com>
Thu, 26 Sep 2013 17:16:35 +0000 (10:16 -0700)
bigtop-packages/src/common/solr/install_solr.sh
bigtop-packages/src/common/solr/solr-server.init.debian
bigtop-packages/src/rpm/solr/SOURCES/solr-server.init
bigtop.mk

index 0aa4097..57618d2 100644 (file)
@@ -185,13 +185,14 @@ SOLR_LOG=${SOLR_LOG:-/var/log/solr}
 SOLR_HOME=${SOLR_HOME:-/var/lib/solr}
 SOLR_LOG4J_CONFIG=${SOLR_LOG4J_CONFIG:-/etc/solr/conf/log4j.properties}
 
-export CATALINA_HOME=${CATALINA_HOME:-$BASEDIR/../bigtop-tomcat}
-export CATALINA_BASE=${CATALINA_BASE:-$BASEDIR/server}
-
 export CATALINA_TMPDIR=${SOLR_DATA:-/var/lib/solr/}
 export CATALINA_PID=${SOLR_RUN:-/var/run/solr}/solr.pid
 export CATALINA_OUT=${SOLR_LOG:-/var/log/solr}/solr.out
 
+export CATALINA_HOME=${CATALINA_HOME:-$BASEDIR/../bigtop-tomcat}
+export CATALINA_BASE=${CATALINA_BASE:-$CATALINA_TMPDIR/tomcat-deployment}
+
+
 die() {
   echo "$@" >&2
   exit 1
index f14a89e..c673603 100644 (file)
@@ -70,7 +70,7 @@ tomcat_deployment() {
 
   rm -r ${DEPLOYMENT_TARGET}
   cp -r ${DEPLOYMENT_SOURCE} ${DEPLOYMENT_TARGET}
-  ln -s ${SOLR_HOME}/webapps ${DEPLOYMENT_TARGET}/
+  ln -s ${SOLR_HOME}/server/webapps ${DEPLOYMENT_TARGET}/
 }
 
 start() {
index 066ba8b..28b26c8 100644 (file)
@@ -70,7 +70,7 @@ tomcat_deployment() {
 
   rm -r ${DEPLOYMENT_TARGET}
   cp -r ${DEPLOYMENT_SOURCE} ${DEPLOYMENT_TARGET}
-  ln -s ${SOLR_HOME}/webapps ${DEPLOYMENT_TARGET}/
+  ln -s ${SOLR_HOME}/server/webapps ${DEPLOYMENT_TARGET}/
 }
 
 start() {
index 5765c8d..1fb5568 100644 (file)
--- a/bigtop.mk
+++ b/bigtop.mk
@@ -213,14 +213,16 @@ $(eval $(call PACKAGE,datafu,DATAFU))
 SOLR_NAME=solr
 SOLR_RELNOTES_NAME=Search engine server
 SOLR_PKG_NAME=solr
-SOLR_BASE_VERSION=4.4.0
-SOLR_PKG_VERSION=4.4.0
+SOLR_BASE_VERSION=4.5.0
+SOLR_PKG_VERSION=4.5.0
 SOLR_RELEASE_VERSION=1
 SOLR_TARBALL_DST=solr-$(SOLR_BASE_VERSION)-src.tgz
 SOLR_TARBALL_SRC=$(SOLR_TARBALL_DST)
 SOLR_DOWNLOAD_PATH=/lucene/solr/$(SOLR_BASE_VERSION)
-SOLR_SITE=$(APACHE_MIRROR)$(SOLR_DOWNLOAD_PATH)
-SOLR_ARCHIVE=$(APACHE_ARCHIVE)$(SOLR_DOWNLOAD_PATH)
+#SOLR_SITE=$(APACHE_MIRROR)$(SOLR_DOWNLOAD_PATH)
+#SOLR_ARCHIVE=$(APACHE_ARCHIVE)$(SOLR_DOWNLOAD_PATH)
+SOLR_SITE=http://people.apache.org/~jpountz/staging_area/lucene-solr-4.5.0-RC3-rev1526423/solr/
+SOLR_ARCHIVE=$(SOLR_SITE)
 $(eval $(call PACKAGE,solr,SOLR))
 
 # Crunch