From 20d9ce299a527cee53340df90dd71fc5856fbcd6 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Wed, 6 Nov 2024 13:22:52 -0500 Subject: [PATCH 1/4] moved unload from shared to enterprise --- .../rest/AbstractUnregisterNodeWebScript.java | 32 +++++++++++-------- .../rest/ReloadNodeShardWebScript.java | 3 +- .../enterprise}/rest/ReloadNodeWebScript.java | 3 +- .../rest/UnloadNodeShardWebScript.java | 2 +- .../enterprise}/rest/UnloadNodeWebScript.java | 2 +- .../inteligr8/alfresco/asie/Constants.java | 4 ++- 6 files changed, 27 insertions(+), 19 deletions(-) rename {shared/src/main/java/com/inteligr8/alfresco/asie => enterprise-module/src/main/java/com/inteligr8/alfresco/asie/enterprise}/rest/AbstractUnregisterNodeWebScript.java (83%) mode change 100644 => 100755 rename {shared/src/main/java/com/inteligr8/alfresco/asie => enterprise-module/src/main/java/com/inteligr8/alfresco/asie/enterprise}/rest/ReloadNodeShardWebScript.java (97%) mode change 100644 => 100755 rename {shared/src/main/java/com/inteligr8/alfresco/asie => enterprise-module/src/main/java/com/inteligr8/alfresco/asie/enterprise}/rest/ReloadNodeWebScript.java (97%) mode change 100644 => 100755 rename {shared/src/main/java/com/inteligr8/alfresco/asie => enterprise-module/src/main/java/com/inteligr8/alfresco/asie/enterprise}/rest/UnloadNodeShardWebScript.java (95%) mode change 100644 => 100755 rename {shared/src/main/java/com/inteligr8/alfresco/asie => enterprise-module/src/main/java/com/inteligr8/alfresco/asie/enterprise}/rest/UnloadNodeWebScript.java (90%) mode change 100644 => 100755 mode change 100644 => 100755 shared/src/main/java/com/inteligr8/alfresco/asie/Constants.java diff --git a/shared/src/main/java/com/inteligr8/alfresco/asie/rest/AbstractUnregisterNodeWebScript.java b/enterprise-module/src/main/java/com/inteligr8/alfresco/asie/enterprise/rest/AbstractUnregisterNodeWebScript.java old mode 100644 new mode 100755 similarity index 83% rename from shared/src/main/java/com/inteligr8/alfresco/asie/rest/AbstractUnregisterNodeWebScript.java rename to enterprise-module/src/main/java/com/inteligr8/alfresco/asie/enterprise/rest/AbstractUnregisterNodeWebScript.java index 08ab4cf..3e34e5c --- a/shared/src/main/java/com/inteligr8/alfresco/asie/rest/AbstractUnregisterNodeWebScript.java +++ b/enterprise-module/src/main/java/com/inteligr8/alfresco/asie/enterprise/rest/AbstractUnregisterNodeWebScript.java @@ -1,4 +1,4 @@ -package com.inteligr8.alfresco.asie.rest; +package com.inteligr8.alfresco.asie.enterprise.rest; import java.io.IOException; import java.io.Serializable; @@ -17,7 +17,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.extensions.webscripts.WebScriptException; import org.springframework.extensions.webscripts.WebScriptRequest; import org.springframework.extensions.webscripts.WebScriptResponse; import org.springframework.http.HttpStatus; @@ -25,6 +24,7 @@ import org.springframework.http.HttpStatus; import com.inteligr8.alfresco.asie.Constants; import com.inteligr8.alfresco.asie.api.CoreAdminApi; import com.inteligr8.alfresco.asie.model.NodeParameterSet; +import com.inteligr8.alfresco.asie.rest.AbstractAsieNodeWebScript; import com.inteligr8.alfresco.asie.service.ShardBackupService; import com.inteligr8.alfresco.asie.spi.ShardStateService; import com.inteligr8.solr.model.CoreMetadata; @@ -84,19 +84,23 @@ public abstract class AbstractUnregisterNodeWebScript Date: Wed, 6 Nov 2024 13:23:17 -0500 Subject: [PATCH 2/4] fix log4j logger name --- .../log4j2.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/enterprise-module/src/main/resources/alfresco/module/com_inteligr8_alfresco_asie-enterprise-platform-module/log4j2.properties b/enterprise-module/src/main/resources/alfresco/module/com_inteligr8_alfresco_asie-enterprise-platform-module/log4j2.properties index f7cf5f9..69e34fa 100644 --- a/enterprise-module/src/main/resources/alfresco/module/com_inteligr8_alfresco_asie-enterprise-platform-module/log4j2.properties +++ b/enterprise-module/src/main/resources/alfresco/module/com_inteligr8_alfresco_asie-enterprise-platform-module/log4j2.properties @@ -1,3 +1,3 @@ -logger.inteligr8-asie.name=com.inteligr8.alfresco.asie.enterprise -logger.inteligr8-asie.level=INFO +logger.inteligr8-asie-ent.name=com.inteligr8.alfresco.asie.enterprise +logger.inteligr8-asie-ent.level=INFO From 4f8d6ad4a0386ee23a9f0080e9427bbd4ddf611a Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Wed, 6 Nov 2024 13:23:42 -0500 Subject: [PATCH 3/4] make ShardSet serializable --- .../com/inteligr8/alfresco/asie/model/ShardSet.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/shared/src/main/java/com/inteligr8/alfresco/asie/model/ShardSet.java b/shared/src/main/java/com/inteligr8/alfresco/asie/model/ShardSet.java index a3b2bb3..348db29 100644 --- a/shared/src/main/java/com/inteligr8/alfresco/asie/model/ShardSet.java +++ b/shared/src/main/java/com/inteligr8/alfresco/asie/model/ShardSet.java @@ -1,5 +1,6 @@ package com.inteligr8.alfresco.asie.model; +import java.io.Serializable; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; @@ -11,8 +12,10 @@ import org.alfresco.repo.index.shard.ShardMethodEnum; import org.alfresco.repo.index.shard.ShardState; import org.apache.commons.lang3.builder.HashCodeBuilder; -public class ShardSet { +public class ShardSet implements Serializable { + private static final long serialVersionUID = -8891094367429601316L; + /** * Examples: * @@ -24,12 +27,12 @@ public class ShardSet { * DATE;key:cm:created;date.grouping:3 * PROPERTY;key:cm:created;regex:^d{4} */ - private final Pattern shardSetPattern = Pattern.compile("([A-Z]+)(;fulltext)?(;([a-z]+):([^;]+))?(;([a-z]+):([^;]+))?"); + private static final Pattern shardSetPattern = Pattern.compile("([A-Z]+)(;fulltext)?(;([a-z]+):([^;]+))?(;([a-z]+):([^;]+))?"); private final ShardMethodEnum method; private final boolean hasContent; private final Map config; - private Integer hash; + private transient Integer hash; public ShardSet(Floc floc, ShardState anyShardNode) { this.method = floc.getShardMethod(); @@ -38,7 +41,7 @@ public class ShardSet { } public ShardSet(String shardSetSpec) { - Matcher matcher = this.shardSetPattern.matcher(shardSetSpec); + Matcher matcher = shardSetPattern.matcher(shardSetSpec); if (!matcher.find()) throw new IllegalArgumentException("The shard set '" + shardSetSpec + "' is not properly formatted"); From f29a0e6e3f8ab672bd28ea4e8ba4cbd0519be2de Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Wed, 6 Nov 2024 13:24:13 -0500 Subject: [PATCH 4/4] moved shardState cache override to community --- .../alfresco-global.properties | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/shared/src/main/resources/alfresco/module/com_inteligr8_alfresco_asie-shared/alfresco-global.properties b/shared/src/main/resources/alfresco/module/com_inteligr8_alfresco_asie-shared/alfresco-global.properties index 47624f6..a29c9b1 100644 --- a/shared/src/main/resources/alfresco/module/com_inteligr8_alfresco_asie-shared/alfresco-global.properties +++ b/shared/src/main/resources/alfresco/module/com_inteligr8_alfresco_asie-shared/alfresco-global.properties @@ -6,17 +6,3 @@ inteligr8.asie.allowedAuthorities=ALFRESCO_ADMINISTRATORS # same as solr.baseUrl, but that property is private to the Search subsystem inteligr8.asie.basePath=/solr - - - -# Overrides of alfresco-repository.jar/alfresco/caches.properties -cache.shardStateSharedCache.tx.maxItems=0 -cache.shardStateSharedCache.tx.statsEnabled=${caches.tx.statsEnabled} -cache.shardStateSharedCache.maxItems=0 -cache.shardStateSharedCache.timeToLiveSeconds=1800 -cache.shardStateSharedCache.maxIdleSeconds=0 -cache.shardStateSharedCache.cluster.type=fully-distributed -cache.shardStateSharedCache.backup-count=1 -cache.shardStateSharedCache.eviction-policy=LRU -cache.shardStateSharedCache.merge-policy=com.hazelcast.spi.merge.PutIfAbsentMergePolicy -cache.shardStateSharedCache.readBackupData=false