Rename properrty to modern system property...

Author: epugh

solr/core/src/java/org/apache/solr/core/ConfigSetService.java

@@ -122,9 +122,7 @@ private void bootstrapConfDir(String confDir) throws IOException {
           "solr.configset.bootstrap.confdir must be a directory of configuration files, configPath: "
               + configPath);
     }
-    String confName =
-        System.getProperty(
-            ZkController.COLLECTION_PARAM_PREFIX + ZkController.CONFIGNAME_PROP, "configuration1");
+    String confName = System.getProperty("solr.collection.config.name", "configuration1");
     this.uploadConfig(confName, configPath);
   }
 

solr/packaging/test/test_start_solr.bats

@@ -94,16 +94,16 @@ teardown() {
   solr assert --started http://localhost:${SOLR_PORT} --timeout 5000
 }
 
-@test "bootstrap configset using system property " {
+@test "bootstrap configset using bootstrap_confdir and collection.configName" {
   local confdir_path="${SOLR_TIP}/server/solr/configsets/sample_techproducts_configs/conf"
   test -d "${confdir_path}"
-
+  
   # This uploads the sample_techproducts_configs/conf directory as "techproducts_bootstrapped" configset
-  solr start -Dsolr.configset.bootstrap.confdir="${confdir_path}" -Dcollection.configName=techproducts_bootstrapped
+  solr start -Dsolr.configset.bootstrap.confdir="${confdir_path}" -Dsolr.collection.config.name=techproducts_bootstrapped
   solr assert --started http://localhost:${SOLR_PORT} --timeout 5000
-
+  
   # Allow time for the configset upload to complete
   sleep 1
-
+  
   config_exists "techproducts_bootstrapped"
 }

solr/solrj/src/resources/DeprecatedSystemPropertyMappings.properties

@@ -21,3 +21,4 @@ solr.delete.unknown.cores=solr.cloud.startup.delete.unknown.cores.enabled
 solr.config.set.forbidden.file.types=solr.configset.forbidden.file.types
 solr.hide.stack.trace=solr.responses.stacktrace.enabled
 bootstrap_confdir=solr.configset.bootstrap.confdir
+collection.config.name=solr.collection.config.name