Commit 83efe3a6 authored by Brian Long's avatar Brian Long
Browse files

move spring value defaults to module alfresco-global

parent fbf6c172

shared/src/main/java/com/inteligr8/alfresco/asie/rest/AbstractActionWebScript.java

+0 −6
Original line number Diff line number Diff line
@@ -9,14 +9,8 @@ import java.util.Map; 
import java.util.concurrent.TimeUnit;

import java.util.concurrent.TimeoutException;



import org.alfresco.model.ContentModel;

import org.alfresco.service.cmr.repository.InvalidNodeRefException;

import org.alfresco.service.cmr.repository.NodeRef;

import org.alfresco.service.cmr.repository.NodeService;

import org.alfresco.service.cmr.repository.StoreRef;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.extensions.webscripts.WebScriptException;

import org.springframework.extensions.webscripts.WebScriptRequest;

import org.springframework.extensions.webscripts.WebScriptResponse;

shared/src/main/java/com/inteligr8/alfresco/asie/service/AbstractActionService.java

+2 −10
Original line number Diff line number Diff line
@@ -12,17 +12,12 @@ import java.util.concurrent.Future; 
import java.util.concurrent.TimeUnit;

import java.util.concurrent.TimeoutException;



import org.alfresco.model.ContentModel;

import org.alfresco.repo.index.shard.Floc;

import org.alfresco.repo.index.shard.Shard;

import org.alfresco.repo.index.shard.ShardInstance;

import org.alfresco.repo.index.shard.ShardRegistry;

import org.alfresco.repo.index.shard.ShardState;

import org.alfresco.service.cmr.repository.StoreRef;

import org.alfresco.service.cmr.search.SearchParameters;

import org.alfresco.service.cmr.search.SearchService;

import org.alfresco.service.namespace.NamespaceService;

import org.alfresco.service.namespace.QName;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.beans.factory.annotation.Autowired;
@@ -45,9 +40,6 @@ public abstract class AbstractActionService { 


	private final Logger logger = LoggerFactory.getLogger(this.getClass());

	

	@Autowired

	private NamespaceService namespaceService;

	

	@Autowired

	private ApiService apiService;
@@ -58,10 +50,10 @@ public abstract class AbstractActionService { 
	@Qualifier(Constants.QUALIFIER_ASIE)

	private ShardRegistry shardRegistry;

	

	@Value("${inteligr8.asie.default.concurrentQueueSize:64}")

	@Value("${inteligr8.asie.default.concurrentQueueSize}")

	private int concurrentQueueSize;

	

	@Value("${inteligr8.asie.default.concurrency:16}")

	@Value("${inteligr8.asie.default.concurrency}")

	private int concurrency;

	

	protected int getConcurrency() {

shared/src/main/java/com/inteligr8/alfresco/asie/service/AbstractNodeActionService.java

+4 −2
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ import java.util.Map.Entry; 
import java.util.Set;

import java.util.concurrent.Callable;

import java.util.concurrent.ExecutionException;

import java.util.concurrent.ExecutorService;

import java.util.concurrent.Future;

import java.util.concurrent.TimeUnit;

import java.util.concurrent.TimeoutException;
@@ -25,6 +26,7 @@ import org.alfresco.service.namespace.NamespaceService; 
import org.alfresco.service.namespace.QName;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.beans.factory.DisposableBean;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.beans.factory.annotation.Qualifier;

import org.springframework.beans.factory.annotation.Value;
@@ -61,10 +63,10 @@ public abstract class AbstractNodeActionService { 
	@Qualifier(Constants.QUALIFIER_ASIE)

	private ShardRegistry shardRegistry;

	

	@Value("${inteligr8.asie.default.concurrentQueueSize:64}")

	@Value("${inteligr8.asie.default.concurrentQueueSize}")

	private int concurrentQueueSize;

	

	@Value("${inteligr8.asie.default.concurrency:16}")

	@Value("${inteligr8.asie.default.concurrency}")

	private int concurrency;

	

	protected int getConcurrency() {

shared/src/main/java/com/inteligr8/alfresco/asie/service/AcsReconcileService.java

+4 −4
Original line number Diff line number Diff line
@@ -62,16 +62,16 @@ public class AcsReconcileService implements InitializingBean, DisposableBean { 
	@Autowired

	private ReindexService reindexService;

	

	@Value("${inteligr8.asie.reconciliation.nodesChunkSize:250}")

	@Value("${inteligr8.asie.reconciliation.nodesChunkSize}")

	private int nodesChunkSize;

	

	@Value("${inteligr8.asie.reconciliation.nodeTimeoutSeconds:10}")

	@Value("${inteligr8.asie.reconciliation.nodeTimeoutSeconds}")

	private int nodeTimeoutSeconds;

	

	@Value("${inteligr8.asie.reconciliation.concurrentQueueSize:64}")

	@Value("${inteligr8.asie.reconciliation.concurrentQueueSize}")

	private int concurrentQueueSize;

	

	@Value("${inteligr8.asie.reconciliation.concurrency:2}")

	@Value("${inteligr8.asie.reconciliation.concurrency}")

	private int concurrency;

	

	private ThrottledThreadPoolExecutor executor;

shared/src/main/java/com/inteligr8/alfresco/asie/service/ApiService.java

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ public class ApiService implements InitializingBean { 
	@Value("${inteligr8.asie.basePath}")

	private String solrBaseUrl;

	

	@Value("${inteligr8.asie.reconciliation.nodesChunkSize:250}")

	@Value("${inteligr8.asie.reconciliation.nodesChunkSize}")

	private int nodesChunkSize;

	

	@Override