Merged DEV/UI-CLUSTERING2 to HEAD

8348: UI cluster support

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8358 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2008-02-22 09:53:50 +00:00
parent 90eff8cbf0
commit 1d96040edf
96 changed files with 1052 additions and 404 deletions

View File

@@ -57,6 +57,8 @@ import org.alfresco.web.ui.common.component.UIPanel.ExpandedEvent;
public class MultilingualManageDialog extends BaseDialogBean
{
private static final long serialVersionUID = 4168804472130450812L;
private final String MSG_MANAGE_DETAILS_FOR="manage_multilingual_details_for";
private static final String MSG_CURRENT = "current";
private static final String ML_VERSION_PANEL_ID = "ml-versions-panel";
@@ -64,10 +66,10 @@ public class MultilingualManageDialog extends BaseDialogBean
protected Map<String, Boolean> panels = new HashMap<String, Boolean>(4, 1.0f);
protected MultilingualContentService multilingualContentService;
protected ContentFilterLanguagesService contentFilterLanguagesService;
protected EditionService editionService;
protected VersionService versionService;
transient private MultilingualContentService multilingualContentService;
transient private ContentFilterLanguagesService contentFilterLanguagesService;
transient private EditionService editionService;
transient private VersionService versionService;
private Node translationDocument;
@@ -105,6 +107,19 @@ public class MultilingualManageDialog extends BaseDialogBean
this.multilingualContentService = multilingualContentService;
}
/**
* @return multilingualContentService
*/
protected MultilingualContentService getMultilingualContentService()
{
//check for null for cluster environment
if (multilingualContentService == null)
{
multilingualContentService = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getMultilingualContentService();
}
return multilingualContentService;
}
/**
* @param contentFilterLanguagesService The Content Filter Languages Service to set.
*/
@@ -113,6 +128,19 @@ public class MultilingualManageDialog extends BaseDialogBean
this.contentFilterLanguagesService = contentFilterLanguagesService;
}
/**
* @return contentFilterLanguagesService
*/
protected ContentFilterLanguagesService getContentFilterLanguagesService()
{
//check for null for cluster environment
if (contentFilterLanguagesService == null)
{
contentFilterLanguagesService = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getContentFilterLanguagesService();
}
return contentFilterLanguagesService;
}
/**
* @param EditionService The Edition Service to set.
*/
@@ -121,6 +149,19 @@ public class MultilingualManageDialog extends BaseDialogBean
this.editionService = editionService;
}
/**
* @return editionService
*/
protected EditionService getEditionService()
{
//check for null for cluster environment
if (editionService == null)
{
editionService = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getEditionService();
}
return editionService;
}
/**
* Sets the version service instance the bean should use
*
@@ -131,6 +172,19 @@ public class MultilingualManageDialog extends BaseDialogBean
this.versionService = versionService;
}
/**
* @return versionService
*/
protected VersionService getVersionService()
{
//check for null for cluster environment
if (versionService == null)
{
versionService = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getVersionService();
}
return versionService;
}
/**
* Before opening the ml container details, remeber the translation
* from which the action comes.
@@ -186,7 +240,7 @@ public class MultilingualManageDialog extends BaseDialogBean
if (document.hasAspect(ContentModel.ASPECT_MULTILINGUAL_DOCUMENT) || ContentModel.TYPE_MULTILINGUAL_CONTAINER.equals(document.getType()))
{
Map<Locale, NodeRef> translationsMap = this.multilingualContentService.getTranslations(getDocument().getNodeRef());
Map<Locale, NodeRef> translationsMap = getMultilingualContentService().getTranslations(getDocument().getNodeRef());
if (translationsMap != null && translationsMap.size() > 0)
{
@@ -201,7 +255,7 @@ public class MultilingualManageDialog extends BaseDialogBean
String lgge = (locale != null) ?
// convert the locale into new ISO codes
contentFilterLanguagesService.convertToNewISOCode(locale.getLanguage()).toUpperCase()
getContentFilterLanguagesService().convertToNewISOCode(locale.getLanguage()).toUpperCase()
: null;
mapNode.put("name", getNodeService().getProperty(nodeRef, ContentModel.PROP_NAME));
@@ -365,7 +419,7 @@ public class MultilingualManageDialog extends BaseDialogBean
{
NodeRef nodeRef = getNode().getNodeRef();
return new Node(multilingualContentService.getTranslationContainer(nodeRef));
return new Node(getMultilingualContentService().getTranslationContainer(nodeRef));
}
}
@@ -382,7 +436,7 @@ public class MultilingualManageDialog extends BaseDialogBean
NodeRef mlContainer = getDocumentMlContainer().getNodeRef();
// get all editions and sort them ascending according their version label
List<Version> orderedEditionList = new ArrayList<Version>(editionService.getEditions(mlContainer).getAllVersions());
List<Version> orderedEditionList = new ArrayList<Version>(getEditionService().getEditions(mlContainer).getAllVersions());
Collections.sort(orderedEditionList, new VersionLabelComparator());
// the list of Single Edition Bean to return
@@ -418,16 +472,16 @@ public class MultilingualManageDialog extends BaseDialogBean
{
// Get the translations because the current edition doesn't content link with its
// translation in the version store.
Map<Locale, NodeRef> translations = multilingualContentService.getTranslations(mlContainer);
Map<Locale, NodeRef> translations = getMultilingualContentService().getTranslations(mlContainer);
translationHistories = new ArrayList<VersionHistory>(translations.size());
for (NodeRef translation : translations.values())
{
translationHistories.add(versionService.getVersionHistory(translation));
translationHistories.add(getVersionService().getVersionHistory(translation));
}
}
else
{
translationHistories = editionService.getVersionedTranslations(edition);
translationHistories = getEditionService().getVersionedTranslations(edition);
}
// add each translation in the SingleEditionBean
@@ -441,7 +495,7 @@ public class MultilingualManageDialog extends BaseDialogBean
Version lastVersion = orderedVersions.get(0);
// get the properties of the lastVersion
Map<QName, Serializable> lastVersionProperties = editionService.getVersionedMetadatas(lastVersion);
Map<QName, Serializable> lastVersionProperties = getEditionService().getVersionedMetadatas(lastVersion);
Locale language = (Locale) lastVersionProperties.get(ContentModel.PROP_LOCALE);
// create a map node representation of the last version
@@ -453,7 +507,7 @@ public class MultilingualManageDialog extends BaseDialogBean
clientLastVersion.put("versionAuthor", lastVersionProperties.get(ContentModel.PROP_AUTHOR));
clientLastVersion.put("versionCreatedDate", lastVersionProperties.get(ContentModel.PROP_CREATED));
clientLastVersion.put("versionModifiedDate", lastVersionProperties.get(ContentModel.PROP_MODIFIED));
clientLastVersion.put("versionLanguage", this.contentFilterLanguagesService.convertToNewISOCode(language.getLanguage()).toUpperCase());
clientLastVersion.put("versionLanguage", getContentFilterLanguagesService().convertToNewISOCode(language.getLanguage()).toUpperCase());
if(getNodeService().hasAspect(lastVersion.getFrozenStateNodeRef(), ContentModel.ASPECT_MULTILINGUAL_EMPTY_TRANSLATION))
{