inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2025-10-08 14:51:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEARCH-56: data.dir.root now configurable externally

Browse Source
This commit is contained in:
Gethin James
2016-06-16 10:52:21 +02:00
parent c167c25dd4
commit 31db7f209b
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
alfresco-solr/src/main/java/org/alfresco/solr/AlfrescoCoreAdminHandler.java
View File

@@ -37,6 +37,7 @@ import org.alfresco.service.cmr.repository.datatype.Duration;
import org.alfresco.solr.adapters.IOpenBitSet; import org.alfresco.solr.adapters.IOpenBitSet;
import org.alfresco.solr.client.Node; import org.alfresco.solr.client.Node;
import org.alfresco.solr.client.SOLRAPIClientFactory; import org.alfresco.solr.client.SOLRAPIClientFactory;
import org.alfresco.solr.config.ConfigUtil;
import org.alfresco.solr.tracker.AclTracker; import org.alfresco.solr.tracker.AclTracker;
import org.alfresco.solr.tracker.ContentTracker; import org.alfresco.solr.tracker.ContentTracker;
import org.alfresco.solr.tracker.IndexHealthReport; import org.alfresco.solr.tracker.IndexHealthReport;
@@ -72,6 +73,7 @@ public class AlfrescoCoreAdminHandler extends CoreAdminHandler
private static final String ARG_ACLID = "aclid"; private static final String ARG_ACLID = "aclid";
private static final String ARG_NODEID = "nodeid"; private static final String ARG_NODEID = "nodeid";
private static final String ARG_QUERY = "query"; private static final String ARG_QUERY = "query";
public static final String DATA_DIR_ROOT = "data.dir.root";
private SolrTrackerScheduler scheduler = null; private SolrTrackerScheduler scheduler = null;
@@ -495,10 +497,15 @@ public class AlfrescoCoreAdminHandler extends CoreAdminHandler
// fix configuration properties // fix configuration properties
File config = new File(newCore, "conf/solrcore.properties"); File config = new File(newCore, "conf/solrcore.properties");
Properties properties = new Properties(); Properties properties = new Properties();
properties.load(new FileInputStream(config)); //Set defaults
properties.setProperty("data.dir.root", newCore.getCanonicalPath()); properties.setProperty(DATA_DIR_ROOT, newCore.getCanonicalPath());
properties.setProperty("data.dir.store", coreName); properties.setProperty("data.dir.store", coreName);
properties.setProperty("alfresco.stores", store); properties.setProperty("alfresco.stores", store);
//Potentially override the defaults
properties.load(new FileInputStream(config));
//Don't overide these
properties.setProperty("alfresco.template", templateName); properties.setProperty("alfresco.template", templateName);
if(aclShardCount > 0) if(aclShardCount > 0)
{ {
@@ -506,6 +513,10 @@ public class AlfrescoCoreAdminHandler extends CoreAdminHandler
properties.setProperty("acl.shard.instance", ""+aclShardInstance); properties.setProperty("acl.shard.instance", ""+aclShardInstance);
} }
//Allow "data.dir.root" to be set via config
properties.setProperty(DATA_DIR_ROOT, ConfigUtil.locateProperty(DATA_DIR_ROOT, properties.getProperty(DATA_DIR_ROOT)));
//Still allow the properties to be overidden via url params
for (Iterator<String> it = params.getParameterNamesIterator(); it.hasNext(); /**/) for (Iterator<String> it = params.getParameterNamesIterator(); it.hasNext(); /**/)
{ {
String paramName = it.next(); String paramName = it.next();