You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by is...@apache.org on 2017/06/29 05:14:21 UTC
lucene-solr:jira/solr-10272: SOLR-10272: Fixing windows script for
_default configset
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-10272 1a700cbd1 -> ce0d561d8
SOLR-10272: Fixing windows script for _default configset
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/ce0d561d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ce0d561d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ce0d561d
Branch: refs/heads/jira/solr-10272
Commit: ce0d561d85e24ad12e9f5b60d605ff669355763b
Parents: 1a700cb
Author: Ishan Chattopadhyaya <is...@apache.org>
Authored: Thu Jun 29 10:44:07 2017 +0530
Committer: Ishan Chattopadhyaya <is...@apache.org>
Committed: Thu Jun 29 10:44:07 2017 +0530
----------------------------------------------------------------------
solr/bin/solr.cmd | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ce0d561d/solr/bin/solr.cmd
----------------------------------------------------------------------
diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index eae6eb2..b268f90 100644
--- a/solr/bin/solr.cmd
+++ b/solr/bin/solr.cmd
@@ -1407,6 +1407,7 @@ IF "!CREATE_NAME!"=="" (
IF "!CREATE_CONFDIR!"=="" set CREATE_CONFDIR=_default
IF "!CREATE_NUM_SHARDS!"=="" set CREATE_NUM_SHARDS=1
IF "!CREATE_REPFACT!"=="" set CREATE_REPFACT=1
+IF "!CREATE_CONFNAME!"=="" set CREATE_CONFNAME=!CREATE_NAME!
REM Find a port that Solr is running on
if "!CREATE_PORT!"=="" (
@@ -1432,7 +1433,7 @@ if "%SCRIPT_CMD%"=="create_core" (
org.apache.solr.util.SolrCLI create_core -name !CREATE_NAME! -solrUrl !SOLR_URL_SCHEME!://%SOLR_TOOL_HOST%:!CREATE_PORT!/solr ^
-confdir !CREATE_CONFDIR! -configsetsDir "%SOLR_TIP%\server\solr\configsets"
) else (
-+ "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" -Dsolr.default.confdir="%DEFAULT_CONFDIR%"^
+ "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" -Dsolr.default.confdir="%DEFAULT_CONFDIR%"^
-Dlog4j.configuration="file:%DEFAULT_SERVER_DIR%\scripts\cloud-scripts\log4j.properties" ^
-classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
org.apache.solr.util.SolrCLI create -name !CREATE_NAME! -shards !CREATE_NUM_SHARDS! -replicationFactor !CREATE_REPFACT! ^