WAVE-311 Updates solr scripts.
Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/f4cf05c3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/f4cf05c3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/f4cf05c3 Branch: refs/heads/fulltextsearch Commit: f4cf05c30f735016829cab7a74e2fdf6fc9b622c Parents: cbe29a5 Author: Yuri Zelikov <[email protected]> Authored: Fri Aug 22 01:09:33 2014 +0300 Committer: Yuri Zelikov <[email protected]> Committed: Fri Aug 22 01:09:33 2014 +0300 ---------------------------------------------------------------------- run-solr.bat | 26 ++++++++++++++++++++++++++ run-solr.sh | 9 +++------ 2 files changed, 29 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/f4cf05c3/run-solr.bat ---------------------------------------------------------------------- diff --git a/run-solr.bat b/run-solr.bat new file mode 100644 index 0000000..2f31236 --- /dev/null +++ b/run-solr.bat @@ -0,0 +1,26 @@ +echo off +rem Licensed to the Apache Software Foundation (ASF) under one or more +rem contributor license agreements. See the NOTICE file distributed with +rem this work for additional information regarding copyright ownership. +rem The ASF licenses this file to You under the Apache License, Version 2.0 +rem (the "License"); you may not use this file except in compliance with +rem the License. You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. + +if not exist "third_party\solr\solr-4.9.0\example" ( + echo "Please download Solr by running: ant get-third-party-solr-dep " + echo "Or download it manually from http://apache.spd.co.il/lucene/solr/4.9.0/ into third_party\solr and unzip there." + pause + exit 1 +) + +cd third_party\solr\solr-4.9.0\example +java -jar start.jar +pause http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/f4cf05c3/run-solr.sh ---------------------------------------------------------------------- diff --git a/run-solr.sh b/run-solr.sh index 7f18090..badf32a 100755 --- a/run-solr.sh +++ b/run-solr.sh @@ -21,13 +21,10 @@ # Make sure the third_party/solr/solr-4.9.0/example folder exists. if [ ! -d third_party/solr/solr-4.9.0/example ]; then - echo "You need to download the solr third party dependency into third_party/solr/ and unzip it by running: ant get-third-party-solr-dep. " + echo "Please download Solr by running: ant get-third-party-solr-dep " echo "Or download it manually from http://apache.spd.co.il/lucene/solr/4.9.0/ into third_party/solr and unzip there." exit 1 fi - -exec java \ - -Dsolr.solr.home=third_party/solr/solr-4.9.0/example/solr\ - -Djetty.home=third_party/solr/solr-4.9.0/example\ - -jar third_party/solr/solr-4.9.0/example/start.jar +cd third_party/solr/solr-4.9.0/example +exec java -jar start.jar
