Commit 006597f6 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into feature/community

parents 3ecbf006 8be29fc3

asie-api/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
	<parent>

		<groupId>com.inteligr8.alfresco</groupId>

		<artifactId>asie-platform-module-parent</artifactId>

		<version>1.1-SNAPSHOT</version>

		<version>1.2-SNAPSHOT</version>

		<relativePath>../</relativePath>

	</parent>

enterprise-module/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
	<parent>

		<groupId>com.inteligr8.alfresco</groupId>

		<artifactId>asie-platform-module-parent</artifactId>

		<version>1.1-SNAPSHOT</version>

		<version>1.2-SNAPSHOT</version>

		<relativePath>../</relativePath>

	</parent>

enterprise-module/src/main/java/com/inteligr8/alfresco/asie/enterprise/rest/AbstractUnregisterNodeWebScript.java

+8 −4
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ import java.util.LinkedList; 
import java.util.List;

import java.util.Map;



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

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

import org.alfresco.service.cmr.attributes.AttributeService;

import org.alfresco.service.cmr.attributes.AttributeService.AttributeQueryCallback;
@@ -23,10 +24,11 @@ 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.model.ShardSet;

import com.inteligr8.alfresco.asie.rest.AbstractAsieNodeWebScript;

import com.inteligr8.alfresco.asie.service.ShardBackupService;

import com.inteligr8.alfresco.asie.spi.ShardStateService;

import com.inteligr8.alfresco.asie.rest.model.NodeParameterSet;

import com.inteligr8.alfresco.asie.spi.ShardBackupService;

import com.inteligr8.alfresco.asie.enterprise.service.ShardStateService;

import com.inteligr8.solr.model.CoreMetadata;

import com.inteligr8.solr.model.core.StatusRequest;

import com.inteligr8.solr.model.core.StatusResponse;
@@ -99,7 +101,9 @@ public abstract class AbstractUnregisterNodeWebScript<T extends NodeParameterSet 
					}

				} finally {

					this.sss.remove(matchingCore.getKey());

					this.sbs.forget(shardNode);

					

					Shard shard = shardNode.getShardInstance().getShard();

					this.sbs.forget(ShardSet.from(shard.getFloc(), shardNode), shard.getInstance());

				}

			}

		} finally {

enterprise-module/src/main/java/com/inteligr8/alfresco/asie/enterprise/rest/UnloadNodeShardWebScript.java

+2 −2
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ import org.alfresco.repo.index.shard.ShardState; 
import org.springframework.extensions.webscripts.WebScriptRequest;

import org.springframework.stereotype.Component;



import com.inteligr8.alfresco.asie.model.NodeShardParameterSet;

import com.inteligr8.alfresco.asie.model.ShardSet;

import com.inteligr8.alfresco.asie.rest.model.NodeShardParameterSet;



@Component(value = "webscript.com.inteligr8.alfresco.asie.nodeShard.delete")

public class UnloadNodeShardWebScript extends AbstractUnregisterNodeWebScript<NodeShardParameterSet> {
@@ -20,7 +20,7 @@ public class UnloadNodeShardWebScript extends AbstractUnregisterNodeWebScript<No 
	

	@Override

	protected boolean matches(NodeShardParameterSet params, ShardState shardState) {

		if (!params.getShardSet().isFor(shardState))

		if (!params.getShardSet().contains(shardState))

			return false;

		if (params.getShardId() != shardState.getShardInstance().getShard().getInstance())

			return false;

enterprise-module/src/main/java/com/inteligr8/alfresco/asie/enterprise/rest/UnloadNodeWebScript.java

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ package com.inteligr8.alfresco.asie.enterprise.rest; 
import org.springframework.extensions.webscripts.WebScriptRequest;

import org.springframework.stereotype.Component;



import com.inteligr8.alfresco.asie.model.NodeParameterSet;

import com.inteligr8.alfresco.asie.rest.model.NodeParameterSet;



@Component(value = "webscript.com.inteligr8.alfresco.asie.node.delete")

public class UnloadNodeWebScript extends AbstractUnregisterNodeWebScript<NodeParameterSet> {