inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2026-09-16 18:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEARCH-304: Making alfresco.encryption* variables configurable

Browse Source
This commit is contained in:
Gethin James
2017-02-07 11:12:10 +01:00
parent 6afdfc8c82
commit b4aee147e1
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
alfresco-search/src/main/java/org/apache/solr/core/CoreDescriptorDecorator.java
+15 -6
View File
@@ -39,10 +39,19 @@ public class CoreDescriptorDecorator
private final Properties properties = new Properties();
public static ImmutableList<String> substitutableProperties =
ImmutableList.of("alfresco.host",
"alfresco.port",
"alfresco.baseUrl",
"alfresco.port.ssl");
ImmutableList.of(
"alfresco.host",
"alfresco.port",
"alfresco.baseUrl",
"alfresco.port.ssl",
"alfresco.encryption.ssl.keystore.passwordFileLocation",
"alfresco.encryption.ssl.truststore.passwordFileLocation",
"alfresco.encryption.ssl.keystore.location",
"alfresco.encryption.ssl.truststore.location",
"alfresco.encryption.ssl.truststore.provider",
"alfresco.encryption.ssl.keystore.type",
"alfresco.encryption.ssl.keystore.provider",
"alfresco.encryption.ssl.truststore.type");
public CoreDescriptorDecorator(CoreDescriptor descriptor)
{
@@ -50,8 +59,8 @@ public class CoreDescriptorDecorator
try
{
substitutableProperties.forEach(prop ->
properties.put(prop, ConfigUtil.locateProperty(prop,properties.getProperty(prop)))
);
properties.put(prop, ConfigUtil.locateProperty(prop,properties.getProperty(prop)))
);
}
catch(Exception e)
{