Return-Path: X-Original-To: apmail-bigtop-commits-archive@www.apache.org Delivered-To: apmail-bigtop-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 12B2310877 for ; Thu, 26 Sep 2013 22:57:03 +0000 (UTC) Received: (qmail 79549 invoked by uid 500); 26 Sep 2013 22:57:03 -0000 Delivered-To: apmail-bigtop-commits-archive@bigtop.apache.org Received: (qmail 79464 invoked by uid 500); 26 Sep 2013 22:57:02 -0000 Mailing-List: contact commits-help@bigtop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: bigtop-dev@bigtop.apache.org Delivered-To: mailing list commits@bigtop.apache.org Received: (qmail 79432 invoked by uid 99); 26 Sep 2013 22:57:02 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Sep 2013 22:57:02 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 231F490B9DA; Thu, 26 Sep 2013 22:57:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rvs@apache.org To: commits@bigtop.apache.org Date: Thu, 26 Sep 2013 22:57:02 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: BIGTOP-1079. bump version of Solr to 4.5.0 Updated Branches: refs/heads/master 7188a9c48 -> 077d35f2e BIGTOP-1079. bump version of Solr to 4.5.0 Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/621d57cc Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/621d57cc Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/621d57cc Branch: refs/heads/master Commit: 621d57ccf118729de774d9a57847c5652931d137 Parents: 7188a9c Author: Roman Shaposhnik Authored: Thu Sep 26 10:03:42 2013 -0700 Committer: Roman Shaposhnik Committed: Thu Sep 26 10:16:35 2013 -0700 ---------------------------------------------------------------------- bigtop-packages/src/common/solr/install_solr.sh | 7 ++++--- bigtop-packages/src/common/solr/solr-server.init.debian | 2 +- bigtop-packages/src/rpm/solr/SOURCES/solr-server.init | 2 +- bigtop.mk | 10 ++++++---- 4 files changed, 12 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/621d57cc/bigtop-packages/src/common/solr/install_solr.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/solr/install_solr.sh b/bigtop-packages/src/common/solr/install_solr.sh index 0aa4097..57618d2 100644 --- a/bigtop-packages/src/common/solr/install_solr.sh +++ b/bigtop-packages/src/common/solr/install_solr.sh @@ -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 http://git-wip-us.apache.org/repos/asf/bigtop/blob/621d57cc/bigtop-packages/src/common/solr/solr-server.init.debian ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/solr/solr-server.init.debian b/bigtop-packages/src/common/solr/solr-server.init.debian index f14a89e..c673603 100644 --- a/bigtop-packages/src/common/solr/solr-server.init.debian +++ b/bigtop-packages/src/common/solr/solr-server.init.debian @@ -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() { http://git-wip-us.apache.org/repos/asf/bigtop/blob/621d57cc/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 066ba8b..28b26c8 100644 --- a/bigtop-packages/src/rpm/solr/SOURCES/solr-server.init +++ b/bigtop-packages/src/rpm/solr/SOURCES/solr-server.init @@ -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() { http://git-wip-us.apache.org/repos/asf/bigtop/blob/621d57cc/bigtop.mk ---------------------------------------------------------------------- diff --git a/bigtop.mk b/bigtop.mk index 5765c8d..1fb5568 100644 --- 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