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

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
104064: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      103990: SHA-879: Overloaded "deployModel" method to make the created model active/inactive based on the passed in argument. Also, externalised the RepoAdminService error messages.,
      104009: SHA-879: An attempt to fix the test failure caused by r103990.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104122 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tatyana Valkevych
2015-05-13 16:26:10 +00:00
parent dd689fb8c4
commit 84ed670287
4 changed files with 112 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
config/alfresco/messages/repoadmin-service.properties Normal file
View File

@@ -0,0 +1,22 @@
# RepoAdminService externalised messages
repoadmin_service.models_location_not_found=Could not find custom models location ''{0}''
repoadmin_service.models_location_multiple_found=Found multiple custom models location ''{0}''
repoadmin_service.model_exists=Model ''{0}'' already exists
repoadmin_service.model_deployment_failed=Model deployment failed
repoadmin_service.model_undeployment_failed=Model undeployment failed
repoadmin_service.model_activation_failed=Model activation failed
repoadmin_service.model_deactivation_failed=Model deactivation failed
repoadmin_service.model_not_found=Could not find custom model ''{0}''
repoadmin_service.models_multiple_found=Found multiple custom models ''{0}''
repoadmin_service.model_already_activated=Model activation failed. Model ''{0}'' is already activated
repoadmin_service.model_already_deactivated=Model deactivation failed. Model ''{0}'' is already deactivated
repoadmin_service.model_no_longer_exists=Model ''{0}'' no longer exists
repoadmin_service.msg_resource_not_found=Could not find message resource bundle ''{0}''
repoadmin_service.msg_resource_deployment_failed=Message resource bundle deployment failed for resource classpath ''{0}''
repoadmin_service.messages_location_not_found=Could not find messages location ''{0}''
repoadmin_service.messages_location_multiple_found=Found multiple messages location ''{0}''
repoadmin_service.msg_resource_undeployment_failed=Message resource bundle undeployment failed
repoadmin_service.msg_resource_reload_failed=Message resource re-load failed
repoadmin_service.msg_missing_bundle_base_name=Message deployment failed. Missing bundle base name
repoadmin_service.msg_base_name_contain_underscore=Message deployment failed. Bundle base name ''{0}'' should not contain ''_'' (underscore)
repoadmin_service.msg_base_name_contain_period=Message deployment failed. Bundle base name ''{0}'' should not contain ''.'' (period)

1
config/alfresco/repo-admin-context.xml
View File

@@ -29,6 +29,7 @@
<property name="resourceBundles">
<list>
<value>alfresco.messages.repoadmin-interpreter-help</value>
<value>alfresco.messages.repoadmin-service</value>
</list>
</property>
</bean>

95
source/java/org/alfresco/repo/admin/RepoAdminServiceImpl.java
View File

@@ -59,6 +59,7 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.dao.ConcurrencyFailureException;
import org.springframework.extensions.surf.util.I18NUtil;
import org.springframework.extensions.surf.util.ParameterCheck;
/**
@@ -88,6 +89,27 @@ public class RepoAdminServiceImpl implements RepoAdminService
public final static String defaultSubtypeOfDictionaryModel = "subtypeOf('cm:dictionaryModel')";
public final static String defaultSubtypeOfContent = "subtypeOf('cm:content')";
private static final String MODELS_LOCATION_NOT_FOUND = "repoadmin_service.models_location_not_found";
private static final String MODELS_LOCATION_MULTIPLE_FOUND = "repoadmin_service.models_location_multiple_found";
private static final String MODEL_EXISTS = "repoadmin_service.model_exists";
private static final String MODEL_DEPLOYMENT_FAILED = "repoadmin_service.model_deployment_failed";
private static final String MODEL_UNDEPLOYMENT_FAILED = "repoadmin_service.model_undeployment_failed";
private static final String MODEL_ACTIVATION_FAILED = "repoadmin_service.model_activation_failed";
private static final String MODEL_DEACTIVATION_FAILED = "repoadmin_service.model_deactivation_failed";
private static final String MODEL_NOT_FOUND = "repoadmin_service.model_not_found";
private static final String MODELS_MULTIPLE_FOUND = "repoadmin_service.models_multiple_found";
private static final String MODEL_ALREADY_ACTIVATED = "repoadmin_service.model_already_activated";
private static final String MODEL_ALREADY_DEACTIVATED = "repoadmin_service.model_already_deactivated";
private static final String MODEL_NO_LONGER_EXISTS = "repoadmin_service.model_no_longer_exists";
private static final String MSG_RESOURCES_NOT_FOUND = "repoadmin_service.msg_resource_not_found";
private static final String MSG_RESOURCES_DEPLOYMENT_FAILED = "repoadmin_service.msg_resource_deployment_failed";
private static final String MESSAGES_LOCATION_NOT_FOUND = "repoadmin_service.messages_location_not_found";
private static final String MESSAGES_LOCATION_MULTIPLE_FOUND = "repoadmin_service.messages_location_multiple_found";
private static final String MSG_RESOURCES_UNDEPLOYMENT_FAILED = "repoadmin_service.msg_resource_undeployment_failed";
private static final String MSG_RESOURCES_RELOAD_FAILED = "repoadmin_service.msg_resource_reload_failed";
private static final String MSG_MISSING_BUNDLE_BASE_NAME = "repoadmin_service.msg_missing_bundle_base_name";
private static final String MSG_BASE_NAME_CONTAIN_UNDERSCORE = "repoadmin_service.msg_base_name_contain_underscore";
private static final String MSG_BASE_NAME_CONTAIN_PERIOD = "repoadmin_service.msg_base_name_contain_period";
public void setDictionaryDAO(DictionaryDAO dictionaryDAO)
{
@@ -199,7 +221,8 @@ public class RepoAdminServiceImpl implements RepoAdminService
return modelsInRepo;
}
public void deployModel(InputStream modelStream, String modelFileName)
@Override
public NodeRef deployModel(InputStream modelStream, String modelFileName, boolean activate)
{
try
{
@@ -217,12 +240,12 @@ public class RepoAdminServiceImpl implements RepoAdminService
if (nodeRefs.size() == 0)
{
throw new AlfrescoRuntimeException("Could not find custom models location " + repoModelsLocation.getPath());
throw new AlfrescoRuntimeException(MODELS_LOCATION_NOT_FOUND, new Object[] { repoModelsLocation.getPath() });
}
else if (nodeRefs.size() > 1)
{
// unexpected: should not find multiple nodes with same name
throw new AlfrescoRuntimeException("Found multiple custom models location " + repoModelsLocation.getPath());
throw new AlfrescoRuntimeException(MODELS_LOCATION_MULTIPLE_FOUND, new Object[] { repoModelsLocation.getPath() });
}
NodeRef customModelsSpaceNodeRef = nodeRefs.get(0);
@@ -256,8 +279,9 @@ public class RepoAdminServiceImpl implements RepoAdminService
{
String msg = "Model already exists: "+modelFileName+" - "+dcnne;
logger.warn(msg);
// for now, assume concurrency failure
throw new ConcurrencyFailureException(msg);
throw new ConcurrencyFailureException(getLocalisedMessage(MODEL_EXISTS, modelFileName));
}
// add titled aspect (for Web Client display)
@@ -281,16 +305,23 @@ public class RepoAdminServiceImpl implements RepoAdminService
modelStream.close();
// activate the model
nodeService.setProperty(modelNodeRef, ContentModel.PROP_MODEL_ACTIVE, new Boolean(true));
nodeService.setProperty(modelNodeRef, ContentModel.PROP_MODEL_ACTIVE, Boolean.valueOf(activate));
// note: model will be loaded as part of DictionaryModelType.beforeCommit()
return modelNodeRef;
}
catch (Throwable e)
{
throw new AlfrescoRuntimeException("Model deployment failed ", e);
throw new AlfrescoRuntimeException(MODEL_DEPLOYMENT_FAILED, e);
}
}
public void deployModel(InputStream modelStream, String modelFileName)
{
deployModel(modelStream, modelFileName, true);
}
public QName activateModel(String modelFileName)
{
try
@@ -299,7 +330,7 @@ public class RepoAdminServiceImpl implements RepoAdminService
}
catch (Throwable e)
{
throw new AlfrescoRuntimeException("Model activation failed ", e);
throw new AlfrescoRuntimeException(MODEL_ACTIVATION_FAILED, e);
}
}
@@ -311,7 +342,7 @@ public class RepoAdminServiceImpl implements RepoAdminService
}
catch (Throwable e)
{
throw new AlfrescoRuntimeException("Model deactivation failed ", e);
throw new AlfrescoRuntimeException(MODEL_DEACTIVATION_FAILED, e);
}
}
@@ -327,12 +358,12 @@ public class RepoAdminServiceImpl implements RepoAdminService
if (nodeRefs.size() == 0)
{
throw new AlfrescoRuntimeException("Could not find custom model " + modelFileName);
throw new AlfrescoRuntimeException(MODEL_NOT_FOUND, new Object[] { modelFileName });
}
else if (nodeRefs.size() > 1)
{
// unexpected: should not find multiple nodes with same name
throw new AlfrescoRuntimeException("Found multiple custom models " + modelFileName);
throw new AlfrescoRuntimeException(MODELS_MULTIPLE_FOUND, new Object[] { modelFileName });
}
NodeRef modelNodeRef = nodeRefs.get(0);
@@ -367,7 +398,7 @@ public class RepoAdminServiceImpl implements RepoAdminService
if (modelDef != null)
{
// model is already activated
throw new AlfrescoRuntimeException("Model activation failed - model '" + modelQName + "' is already activated");
throw new AlfrescoRuntimeException(MODEL_ALREADY_ACTIVATED, new Object[] { modelQName });
}
else
{
@@ -390,7 +421,7 @@ public class RepoAdminServiceImpl implements RepoAdminService
if (modelDef == null)
{
// model is already deactivated
throw new AlfrescoRuntimeException("Model deactivation failed - model '" + modelQName + "' is already deactivated");
throw new AlfrescoRuntimeException(MODEL_ALREADY_DEACTIVATED, new Object[] { modelQName });
}
else
{
@@ -437,17 +468,17 @@ public class RepoAdminServiceImpl implements RepoAdminService
String msg = "Model no longer exists: "+modelFileName+" - "+inre;
logger.warn(msg);
// for now, assume concurrency failure
throw new ConcurrencyFailureException(msg);
throw new ConcurrencyFailureException(getLocalisedMessage(MODEL_NO_LONGER_EXISTS, modelFileName));
}
if (nodeRefs.size() == 0)
{
throw new AlfrescoRuntimeException("Could not find custom model " + modelFileName);
throw new AlfrescoRuntimeException(MODEL_NOT_FOUND, new Object[] { modelFileName });
}
else if (nodeRefs.size() > 1)
{
// unexpected: should not find multiple nodes with same name
throw new AlfrescoRuntimeException("Found multiple custom models " + modelFileName);
throw new AlfrescoRuntimeException(MODELS_MULTIPLE_FOUND, new Object[] { modelFileName });
}
NodeRef modelNodeRef = nodeRefs.get(0);
@@ -501,7 +532,7 @@ public class RepoAdminServiceImpl implements RepoAdminService
}
catch (Throwable e)
{
throw new AlfrescoRuntimeException("Model undeployment failed ", e);
throw new AlfrescoRuntimeException(MODEL_UNDEPLOYMENT_FAILED, e);
}
return modelQName;
@@ -626,12 +657,12 @@ public class RepoAdminServiceImpl implements RepoAdminService
else
{
logger.warn("No message resources found: " + resourceClasspath);
throw new AlfrescoRuntimeException("No message resources found: " + resourceClasspath);
throw new AlfrescoRuntimeException(MSG_RESOURCES_NOT_FOUND, new Object[] { resourceClasspath });
}
}
catch (Throwable e)
{
throw new AlfrescoRuntimeException("Message resource bundle deployment failed for resource classpath " + resourceClasspath, e);
throw new AlfrescoRuntimeException(MSG_RESOURCES_DEPLOYMENT_FAILED, new Object[] { resourceClasspath }, e);
}
return bundleBaseName;
@@ -659,12 +690,12 @@ public class RepoAdminServiceImpl implements RepoAdminService
if (nodeRefs.size() == 0)
{
throw new AlfrescoRuntimeException("Could not find messages location " + repoMessagesLocation.getPath());
throw new AlfrescoRuntimeException(MESSAGES_LOCATION_NOT_FOUND, new Object[] { repoMessagesLocation.getPath() });
}
else if (nodeRefs.size() > 1)
{
// unexpected: should not find multiple nodes with same name
throw new AlfrescoRuntimeException("Found multiple messages location " + repoMessagesLocation.getPath());
throw new AlfrescoRuntimeException(MESSAGES_LOCATION_MULTIPLE_FOUND, new Object[] { repoMessagesLocation.getPath() });
}
NodeRef customLabelsNodeRef = nodeRefs.get(0);
@@ -756,12 +787,12 @@ public class RepoAdminServiceImpl implements RepoAdminService
}
else
{
throw new AlfrescoRuntimeException("Could not find message resource bundle " + repoBundlePath);
throw new AlfrescoRuntimeException(MSG_RESOURCES_NOT_FOUND, new Object[] { repoBundlePath });
}
}
catch (Throwable t)
{
throw new AlfrescoRuntimeException("Message resource bundle undeployment failed ", t);
throw new AlfrescoRuntimeException(MSG_RESOURCES_UNDEPLOYMENT_FAILED, t);
}
}
@@ -802,12 +833,12 @@ public class RepoAdminServiceImpl implements RepoAdminService
}
else
{
throw new AlfrescoRuntimeException("Could not find message resource bundle " + repoBundlePath);
throw new AlfrescoRuntimeException(MSG_RESOURCES_NOT_FOUND, new Object[] { repoBundlePath });
}
}
catch (Throwable e)
{
throw new AlfrescoRuntimeException("Message resource re-load failed", e);
throw new AlfrescoRuntimeException(MSG_RESOURCES_RELOAD_FAILED, e);
}
}
@@ -815,18 +846,18 @@ public class RepoAdminServiceImpl implements RepoAdminService
{
if ((bundleBaseName == null) || (bundleBaseName.equals("")))
{
throw new AlfrescoRuntimeException("Message deployment failed - missing bundle base name");
throw new AlfrescoRuntimeException(MSG_MISSING_BUNDLE_BASE_NAME);
}
if (bundleBaseName.indexOf("_") != -1)
{
// currently limited due to parser in MessageServiceImpl.getBaseBundleName
throw new AlfrescoRuntimeException("Message deployment failed - bundle base name '" + bundleBaseName + "' should not contain '_' (underscore)");
throw new AlfrescoRuntimeException(MSG_BASE_NAME_CONTAIN_UNDERSCORE, new Object[] { bundleBaseName });
}
if (bundleBaseName.indexOf(".") != -1)
{
throw new AlfrescoRuntimeException("Message deployment failed - bundle base name '" + bundleBaseName + "' should not contain '.' (period)");
throw new AlfrescoRuntimeException(MSG_BASE_NAME_CONTAIN_PERIOD, new Object[] { bundleBaseName });
}
}
@@ -853,4 +884,14 @@ public class RepoAdminServiceImpl implements RepoAdminService
{
return repoUsageComponent.getUsageStatus();
}
private String getLocalisedMessage(String msgId, Object... params)
{
String localisedMsg = I18NUtil.getMessage(msgId, params);
if (localisedMsg == null)
{
localisedMsg = msgId;
}
return localisedMsg;
}
}

14
source/java/org/alfresco/service/cmr/admin/RepoAdminService.java
View File

@@ -23,8 +23,8 @@ import java.util.List;
import org.alfresco.repo.admin.RepoModelDefinition;
import org.alfresco.service.Auditable;
import org.alfresco.service.PublicService;
import org.alfresco.service.cmr.admin.RepoUsage.UsageType;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.namespace.QName;
@@ -54,6 +54,18 @@ public interface RepoAdminService
@Auditable(parameters = {"modelStream", "modelFileName"}, recordable = {false, true})
public void deployModel(InputStream modelStream, String modelFileName);
/**
* Deploy custom model (to the 'Models' space). Allows creation of new
* models and incremental update of existing models.
*
* @param modelStream the model input stream
* @param modelFileName modelFileName the model file name
* @param activate whether the model should be activated or not
* @return the nodeRef of the created model
*/
@Auditable(parameters = { "modelStream", "modelFileName", "activate" }, recordable = { false, true, false })
public NodeRef deployModel(InputStream modelStream, String modelFileName, boolean activate);
/**
* Undeploy custom model (from the 'Models' space).
* Allows delete of existing models, if not used.