bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject [1/5] BIGTOP-1079. bump version of Solr to 4.4.0
Date Wed, 25 Sep 2013 21:35:13 GMT
Updated Branches:
  refs/heads/master 8ecc8e3a2 -> 3d5a79f9b


http://git-wip-us.apache.org/repos/asf/bigtop/blob/83a688b3/bigtop-packages/src/rpm/solr/SOURCES/solr-server.init
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/solr/SOURCES/solr-server.init b/bigtop-packages/src/rpm/solr/SOURCES/solr-server.init
index f2cd481..066ba8b 100644
--- a/bigtop-packages/src/rpm/solr/SOURCES/solr-server.init
+++ b/bigtop-packages/src/rpm/solr/SOURCES/solr-server.init
@@ -48,7 +48,12 @@ SOLR_LOCK_DIR="/var/lock/subsys/"
 LOCKFILE="${SOLR_LOCK_DIR}/solr"
 desc="Solr server daemon"
 
-EXEC_PATH=$SOLR_HOME/bin/solrd
+EXEC_PATH=". $SOLR_HOME/bin/solrd"
+
+BIGTOP_DEFAULTS_DIR=${BIGTOP_DEFAULTS_DIR-/etc/default}
+[ -n "${BIGTOP_DEFAULTS_DIR}" -a -r ${BIGTOP_DEFAULTS_DIR}/solr ] && \
+    EXEC_PATH=". ${BIGTOP_DEFAULTS_DIR}/solr ; ${EXEC_PATH}"
+
 SOLR_PID_FILE=${SOLR_RUN_DIR}/solr.pid
 
 # These directories may be tmpfs and may or may not exist
@@ -71,7 +76,7 @@ tomcat_deployment() {
 start() {
   [ -x $exec ] || exit $ERROR_PROGRAM_NOT_INSTALLED
 
-  checkstatus
+  checkstatus > /dev/null 2>&1
   status=$?
   if [ "$status" -eq "$STATUS_RUNNING" ]; then
     exit 0
@@ -87,8 +92,8 @@ start() {
 
 stop() {
   if [ ! -e $SOLR_PID_FILE ]; then
-    log_failure_msg "$desc is not running"
-    exit 0
+    log_success_msg "$desc is not running"
+    return 0
   fi
 
   log_success_msg "Stopping ${desc}: "
@@ -131,6 +136,10 @@ condrestart(){
   [ -e ${LOCKFILE} ] && restart || :
 }
 
+init(){
+  rm -rf /var/lib/solr/*
+}
+
 case "$1" in
   start)
     start
@@ -147,8 +156,11 @@ case "$1" in
   condrestart|try-restart)
     condrestart
     ;;
+  init)
+    init
+    ;;
   *)
-    echo $"Usage: $0 {start|stop|status|restart|try-restart|condrestart}"
+    echo $"Usage: $0 {start|stop|status|restart|try-restart|condrestart|init}"
     exit 1
 esac
 

http://git-wip-us.apache.org/repos/asf/bigtop/blob/83a688b3/bigtop-packages/src/rpm/solr/SPECS/solr.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/solr/SPECS/solr.spec b/bigtop-packages/src/rpm/solr/SPECS/solr.spec
index e8de186..328d2c3 100644
--- a/bigtop-packages/src/rpm/solr/SPECS/solr.spec
+++ b/bigtop-packages/src/rpm/solr/SPECS/solr.spec
@@ -57,6 +57,9 @@ Source4: web.xml
 Source5: logging.properties
 Source6: solr.default
 Source7: solr-server.init
+Source8: schema.xml
+Source9: solrconfig.xml
+Source10: solrctl.sh
 Requires: bigtop-utils >= 0.7, bigtop-tomcat
 
 # CentOS 5 does not have any dist macro
@@ -156,7 +159,7 @@ fi
 %config(noreplace) %{config_solr}.dist
 %config(noreplace) /etc/default/solr 
 %{lib_solr}
-# %{bin_solr}/solr
+%{bin_solr}/solrctl
 %defattr(-,solr,solr,755)
 /var/lib/solr
 /var/run/solr

http://git-wip-us.apache.org/repos/asf/bigtop/blob/83a688b3/bigtop.mk
----------------------------------------------------------------------
diff --git a/bigtop.mk b/bigtop.mk
index c5aebae..253a8b1 100644
--- a/bigtop.mk
+++ b/bigtop.mk
@@ -213,8 +213,8 @@ $(eval $(call PACKAGE,datafu,DATAFU))
 SOLR_NAME=solr
 SOLR_RELNOTES_NAME=Search engine server
 SOLR_PKG_NAME=solr
-SOLR_BASE_VERSION=4.2.1
-SOLR_PKG_VERSION=4.2.1
+SOLR_BASE_VERSION=4.4.0
+SOLR_PKG_VERSION=4.4.0
 SOLR_RELEASE_VERSION=1
 SOLR_TARBALL_DST=solr-$(SOLR_BASE_VERSION)-src.tgz
 SOLR_TARBALL_SRC=$(SOLR_TARBALL_DST)


Mime
View raw message