You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by an...@apache.org on 2015/05/23 12:00:42 UTC

svn commit: r1681307 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/core/ solr/core/src/java/org/apache/solr/util/SolrCLI.java

Author: andyetitmoves
Date: Sat May 23 10:00:42 2015
New Revision: 1681307

URL: http://svn.apache.org/r1681307
Log:
SOLR-7545: Replace some hardcoded occurrences of default URL

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/solr/   (props changed)
    lucene/dev/branches/branch_5x/solr/core/   (props changed)
    lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/util/SolrCLI.java

Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/util/SolrCLI.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/util/SolrCLI.java?rev=1681307&r1=1681306&r2=1681307&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/util/SolrCLI.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/util/SolrCLI.java Sat May 23 10:00:42 2015
@@ -1370,7 +1370,7 @@ public class SolrCLI {
               .withArgName("URL")
               .hasArg()
               .isRequired(false)
-              .withDescription("Base Solr URL, default is http://localhost:8983/solr")
+              .withDescription("Base Solr URL, default is " + DEFAULT_SOLR_URL)
               .create("solrUrl"),
           OptionBuilder
               .withArgName("NAME")
@@ -1396,7 +1396,7 @@ public class SolrCLI {
     @Override
     public int runTool(CommandLine cli) throws Exception {
 
-      String solrUrl = cli.getOptionValue("solrUrl", "http://localhost:8983/solr");
+      String solrUrl = cli.getOptionValue("solrUrl", DEFAULT_SOLR_URL);
       if (!solrUrl.endsWith("/"))
         solrUrl += "/";
 
@@ -1532,7 +1532,7 @@ public class SolrCLI {
     @Override
     public int runTool(CommandLine cli) throws Exception {
 
-      String solrUrl = cli.getOptionValue("solrUrl", "http://localhost:8983/solr");
+      String solrUrl = cli.getOptionValue("solrUrl", DEFAULT_SOLR_URL);
       if (!solrUrl.endsWith("/"))
         solrUrl += "/";
 
@@ -1577,7 +1577,7 @@ public class SolrCLI {
               .withArgName("URL")
               .hasArg()
               .isRequired(false)
-              .withDescription("Base Solr URL, default is http://localhost:8983/solr")
+              .withDescription("Base Solr URL, default is " + DEFAULT_SOLR_URL)
               .create("solrUrl"),
           OptionBuilder
               .withArgName("NAME")
@@ -1611,7 +1611,7 @@ public class SolrCLI {
       LogManager.getLogger("org.apache.zookeeper").setLevel(Level.ERROR);
       LogManager.getLogger("org.apache.solr.common.cloud").setLevel(Level.WARN);
 
-      String solrUrl = cli.getOptionValue("solrUrl", "http://localhost:8983/solr");
+      String solrUrl = cli.getOptionValue("solrUrl", DEFAULT_SOLR_URL);
       if (!solrUrl.endsWith("/"))
         solrUrl += "/";