I managed to chop off the 'solr.' prefix of all these substitutions in SOLR-4914. The tricksy part here is that these prefixes are not present in the core.properties file, so we need to add them in/strip them out at the appropriate times.

The only call where the 'solr.' prefix needs to be present is in the Properties object returned by CoreDescriptor.getCoreProperties(), and this method is only ever called when creating ResourceLoaders, so we should be able to safely isolate the changes here.

Quick patch, which should solve the problem. I need to think of a decent way of testing it, though - is there a reasonably non-invasive solrconfig parameter I can use here?

Patch with test. The test setup is a bit complicated, because the standard TestHarness setup doesn't use a CoreContainer or CoreDescriptor to set up its cores, so substitutions won't work. Which is less than ideal, but that's for another issue.

Shawn Heisey, does this fix your setup?

Commit 1515032 from Alan Woodward in branch 'dev/trunk'
[ https://svn.apache.org/r1515032 ]

SOLR-5162: Add back core implicit properties

Commit 1515034 from Alan Woodward in branch 'dev/branches/branch_4x'
[ https://svn.apache.org/r1515034 ]

SOLR-5162: Add back core implicit properties

Commit 1515035 from Alan Woodward in branch 'dev/trunk'
[ https://svn.apache.org/r1515035 ]

SOLR-5162: ...with the right license header this time

Commit 1515036 from Alan Woodward in branch 'dev/branches/branch_4x'
[ https://svn.apache.org/r1515036 ]

SOLR-5162: ...with the right license header this time

Was it intentional that the "name" property disappear? See SOLR-5281

Was it intentional that the "name" property disappear? See SOLR-5281

Answering my own question: Yes:

  /**
   * Create the properties object used by resource loaders, etc, for property
   * substitution.  The default solr properties are prefixed with 'solr.core.', so,
   * e.g., 'name' becomes 'solr.core.name'
   */
  protected void buildSubstitutableProperties() {
    for (String propName : coreProperties.stringPropertyNames()) {
      String propValue = coreProperties.getProperty(propName);
      if (!isUserDefinedProperty(propName))
        propName = "solr.core." + propName;
      substitutableProperties.setProperty(propName, propValue);
    }
  }

4.5 release -> bulk close