diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
index 3751f2ccbb..945baa5a3c 100644
--- a/config/alfresco/messages/webclient.properties
+++ b/config/alfresco/messages/webclient.properties
@@ -353,6 +353,7 @@ Collaborator=Collaborator
Contributor=Contributor
Editor=Editor
All=All
+FullControl=Full Control
ContentManager=Content Manager
ContentPublisher=Content Publisher
ContentContributor=Content Contributor
diff --git a/pom.xml b/pom.xml
index 20c64fb520..20b8e6112e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -237,12 +237,6 @@
1.3.167
test
-
- org.activiti
- activiti-webapp-explorer2
- 5.7
- ui-jar
-
axis2
addressing
@@ -307,10 +301,7 @@
enterprise
-
- alfresco.enterprise
- true
-
+ true
diff --git a/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java b/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
index 88974bea61..012ca40fda 100644
--- a/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
+++ b/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
@@ -499,18 +499,11 @@ public final class AuthenticationHelper
String userId = null;
// If the remote user mapper is configured, we may be able to map in an externally authenticated user
- final WebApplicationContext wc = WebApplicationContextUtils.getRequiredWebApplicationContext(sc);
- RemoteUserMapper remoteUserMapper = (RemoteUserMapper) wc.getBean(REMOTE_USER_MAPPER);
- if (!(remoteUserMapper instanceof ActivateableBean) || ((ActivateableBean) remoteUserMapper).isActive())
+ RemoteUserMapper remoteUserMapper = getRemoteUserMapper(sc);
+ if (remoteUserMapper != null)
{
- if (logger.isDebugEnabled())
- logger.debug("Remote user mapper configured and active. Asking for external user ID.");
userId = remoteUserMapper.getRemoteUser(httpRequest);
}
- else if (logger.isDebugEnabled())
- {
- logger.debug("No active remote user mapper.");
- }
if (logger.isDebugEnabled())
{
if (userId == null)
@@ -526,6 +519,31 @@ public final class AuthenticationHelper
return userId;
}
+ /**
+ * Gets the remote user mapper if one is configured and active (i.e. external authentication is in use).
+ * @param sc
+ * the servlet context
+ * @return the remote user mapper if one is configured and active; otherwise null
+ */
+ public static RemoteUserMapper getRemoteUserMapper(final ServletContext sc)
+ {
+ final WebApplicationContext wc = WebApplicationContextUtils.getRequiredWebApplicationContext(sc);
+ RemoteUserMapper remoteUserMapper = (RemoteUserMapper) wc.getBean(REMOTE_USER_MAPPER);
+ if (remoteUserMapper != null && !(remoteUserMapper instanceof ActivateableBean) || ((ActivateableBean) remoteUserMapper).isActive())
+ {
+ if (logger.isDebugEnabled())
+ {
+ logger.debug("Remote user mapper configured and active.");
+ }
+ return remoteUserMapper;
+ }
+ if (logger.isDebugEnabled())
+ {
+ logger.debug("No active remote user mapper.");
+ }
+ return null;
+ }
+
/**
* Attempts to retrieve the User object stored in the current session.
*
diff --git a/source/java/org/alfresco/web/app/servlet/BaseServlet.java b/source/java/org/alfresco/web/app/servlet/BaseServlet.java
index 636acd288d..9b0be6a8ea 100644
--- a/source/java/org/alfresco/web/app/servlet/BaseServlet.java
+++ b/source/java/org/alfresco/web/app/servlet/BaseServlet.java
@@ -224,7 +224,7 @@ public abstract class BaseServlet extends HttpServlet
public static void redirectToLoginPage(HttpServletRequest req, HttpServletResponse res, ServletContext sc)
throws IOException
{
- redirectToLoginPage(req, res, sc, AuthenticationHelper.getRemoteUser(sc, req) == null);
+ redirectToLoginPage(req, res, sc, AuthenticationHelper.getRemoteUserMapper(sc) == null);
}
/**
diff --git a/source/java/org/alfresco/web/bean/actions/BaseActionWizard.java b/source/java/org/alfresco/web/bean/actions/BaseActionWizard.java
index 3c8f633954..201c6e7e98 100644
--- a/source/java/org/alfresco/web/bean/actions/BaseActionWizard.java
+++ b/source/java/org/alfresco/web/bean/actions/BaseActionWizard.java
@@ -401,7 +401,7 @@ public abstract class BaseActionWizard extends BaseWizardBean
// if there wasn't a client based label try and get it from the dictionary
if (label == null)
{
- label = typeDef.getTitle();
+ label = typeDef.getTitle(this.getDictionaryService());
}
// finally, just use the localname
@@ -1053,7 +1053,7 @@ public abstract class BaseActionWizard extends BaseWizardBean
AspectDefinition aspectDef = this.getDictionaryService().getAspect(idQName);
if (aspectDef != null)
{
- label = aspectDef.getTitle();
+ label = aspectDef.getTitle(this.getDictionaryService());
}
else
{
diff --git a/source/java/org/alfresco/web/bean/content/BaseContentWizard.java b/source/java/org/alfresco/web/bean/content/BaseContentWizard.java
index 50aa0df896..6237fc6620 100644
--- a/source/java/org/alfresco/web/bean/content/BaseContentWizard.java
+++ b/source/java/org/alfresco/web/bean/content/BaseContentWizard.java
@@ -337,7 +337,7 @@ public abstract class BaseContentWizard extends BaseWizardBean
// if there wasn't a client based label try and get it from the dictionary
if (parentLabel == null)
{
- parentLabel = parentType.getTitle();
+ parentLabel = parentType.getTitle(this.getDictionaryService());
}
// finally, just use the localname
@@ -370,7 +370,7 @@ public abstract class BaseContentWizard extends BaseWizardBean
// if there wasn't a client based label try and get it from the dictionary
if (label == null)
{
- label = typeDef.getTitle();
+ label = typeDef.getTitle(this.getDictionaryService());
}
// finally, just use the localname
diff --git a/source/java/org/alfresco/web/bean/generator/BaseComponentGenerator.java b/source/java/org/alfresco/web/bean/generator/BaseComponentGenerator.java
index e63a1f0b12..acd923b7dc 100644
--- a/source/java/org/alfresco/web/bean/generator/BaseComponentGenerator.java
+++ b/source/java/org/alfresco/web/bean/generator/BaseComponentGenerator.java
@@ -66,7 +66,7 @@ public abstract class BaseComponentGenerator implements IComponentGenerator
protected enum ControlType { FIELD, SELECTOR; }
- private DataDictionary dataDictionary;
+ protected DataDictionary dataDictionary;
@SuppressWarnings("unchecked")
public UIComponent generateAndAdd(FacesContext context, UIPropertySheet propertySheet,
diff --git a/source/java/org/alfresco/web/bean/generator/TextFieldGenerator.java b/source/java/org/alfresco/web/bean/generator/TextFieldGenerator.java
index fb4b2aeafd..1d1c7d7db1 100644
--- a/source/java/org/alfresco/web/bean/generator/TextFieldGenerator.java
+++ b/source/java/org/alfresco/web/bean/generator/TextFieldGenerator.java
@@ -160,7 +160,7 @@ public class TextFieldGenerator extends BaseComponentGenerator
}
// retrieve the display label
- String label = constraint.getDisplayLabel(value);
+ String label = constraint.getDisplayLabel(value, dataDictionary.getDictionaryService());
if (label == null)
{
label = value;
diff --git a/source/java/org/alfresco/web/bean/repository/DataDictionary.java b/source/java/org/alfresco/web/bean/repository/DataDictionary.java
index 1bfa5415a1..f0382ff924 100644
--- a/source/java/org/alfresco/web/bean/repository/DataDictionary.java
+++ b/source/java/org/alfresco/web/bean/repository/DataDictionary.java
@@ -58,7 +58,7 @@ public final class DataDictionary implements Serializable
/**
*@return dictionaryService
*/
- private DictionaryService getDictionaryService()
+ public DictionaryService getDictionaryService()
{
//check for null for cluster environment
if (dictionaryService == null)
diff --git a/source/java/org/alfresco/web/bean/rules/CreateRuleWizard.java b/source/java/org/alfresco/web/bean/rules/CreateRuleWizard.java
index b9363254a7..e04ef04b50 100644
--- a/source/java/org/alfresco/web/bean/rules/CreateRuleWizard.java
+++ b/source/java/org/alfresco/web/bean/rules/CreateRuleWizard.java
@@ -317,7 +317,7 @@ public class CreateRuleWizard extends BaseActionWizard
TypeDefinition typeDef = this.getDictionaryService().getType(idQName);
if (typeDef != null)
{
- label = typeDef.getTitle();
+ label = typeDef.getTitle(this.getDictionaryService());
}
else
{
diff --git a/source/java/org/alfresco/web/bean/search/AdvancedSearchDialog.java b/source/java/org/alfresco/web/bean/search/AdvancedSearchDialog.java
index f53c60b1a4..593dcee0b8 100644
--- a/source/java/org/alfresco/web/bean/search/AdvancedSearchDialog.java
+++ b/source/java/org/alfresco/web/bean/search/AdvancedSearchDialog.java
@@ -172,7 +172,7 @@ public class AdvancedSearchDialog extends BaseDialogBean
// add the well known cm:content object type by default
properties.setContentTypes(new ArrayList(5));
properties.getContentTypes().add(new SelectItem(ContentModel.TYPE_CONTENT.toString(),
- dictionaryService.getType(ContentModel.TYPE_CONTENT).getTitle()));
+ dictionaryService.getType(ContentModel.TYPE_CONTENT).getTitle(dictionaryService)));
// add any configured content sub-types to the list
List types = getSearchConfig().getContentTypes();
@@ -188,7 +188,7 @@ public class AdvancedSearchDialog extends BaseDialogBean
if (typeDef != null && dictionaryService.isSubClass(typeDef.getName(), ContentModel.TYPE_CONTENT))
{
// try and get label from the dictionary
- String label = typeDef.getTitle();
+ String label = typeDef.getTitle(dictionaryService);
// else just use the localname
if (label == null)
@@ -220,7 +220,7 @@ public class AdvancedSearchDialog extends BaseDialogBean
// add the well known cm:folder object type by default
properties.setFolderTypes(new ArrayList(5));
properties.getFolderTypes().add(new SelectItem(ContentModel.TYPE_FOLDER.toString(),
- dictionaryService.getType(ContentModel.TYPE_FOLDER).getTitle()));
+ dictionaryService.getType(ContentModel.TYPE_FOLDER).getTitle(dictionaryService)));
// add any configured folder sub-types to the list
List types = getSearchConfig().getFolderTypes();
@@ -236,7 +236,7 @@ public class AdvancedSearchDialog extends BaseDialogBean
if (typeDef != null && dictionaryService.isSubClass(typeDef.getName(), ContentModel.TYPE_FOLDER))
{
// try and get label from the dictionary
- String label = typeDef.getTitle();
+ String label = typeDef.getTitle(dictionaryService);
// else just use the localname
if (label == null)
diff --git a/source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java b/source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java
index c1ff946bdb..483b4592b5 100644
--- a/source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java
+++ b/source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java
@@ -567,7 +567,7 @@ public class CreateSpaceWizard extends BaseWizardBean
// if there wasn't a client based label try and get it from the dictionary
if (label == null)
{
- label = typeDef.getTitle();
+ label = typeDef.getTitle(this.getDictionaryService());
}
// finally use the localname if we still haven't found a label
diff --git a/source/java/org/alfresco/web/ui/repo/component/UISearchCustomProperties.java b/source/java/org/alfresco/web/ui/repo/component/UISearchCustomProperties.java
index 0a338f7591..d9440a9b32 100644
--- a/source/java/org/alfresco/web/ui/repo/component/UISearchCustomProperties.java
+++ b/source/java/org/alfresco/web/ui/repo/component/UISearchCustomProperties.java
@@ -200,7 +200,7 @@ public class UISearchCustomProperties extends SelfRenderingComponent implements
else
{
// or use dictionary label or QName as last resort
- label = propDef.getTitle() != null ? propDef.getTitle() : propDef.getName().getLocalName();
+ label = propDef.getTitle(dd) != null ? propDef.getTitle(dd) : propDef.getName().getLocalName();
}
// special handling for Date and DateTime
diff --git a/source/java/org/alfresco/web/ui/repo/component/property/UIAssociation.java b/source/java/org/alfresco/web/ui/repo/component/property/UIAssociation.java
index 72ed530f83..2b532b2647 100644
--- a/source/java/org/alfresco/web/ui/repo/component/property/UIAssociation.java
+++ b/source/java/org/alfresco/web/ui/repo/component/property/UIAssociation.java
@@ -89,7 +89,7 @@ public class UIAssociation extends PropertySheetItem
if (displayLabel == null)
{
// try and get the repository assigned label
- displayLabel = assocDef.getTitle();
+ displayLabel = assocDef.getTitle(dd.getDictionaryService());
// if the label is still null default to the local name of the property
if (displayLabel == null)
diff --git a/source/java/org/alfresco/web/ui/repo/component/property/UIChildAssociation.java b/source/java/org/alfresco/web/ui/repo/component/property/UIChildAssociation.java
index 260c44bfd2..318fe272a4 100644
--- a/source/java/org/alfresco/web/ui/repo/component/property/UIChildAssociation.java
+++ b/source/java/org/alfresco/web/ui/repo/component/property/UIChildAssociation.java
@@ -89,7 +89,7 @@ public class UIChildAssociation extends PropertySheetItem
if (displayLabel == null)
{
// try and get the repository assigned label
- displayLabel = assocDef.getTitle();
+ displayLabel = assocDef.getTitle(dd.getDictionaryService());
// if the label is still null default to the local name of the property
if (displayLabel == null)
diff --git a/source/java/org/alfresco/web/ui/repo/component/property/UIProperty.java b/source/java/org/alfresco/web/ui/repo/component/property/UIProperty.java
index 1e26a119a2..0aff4d416c 100644
--- a/source/java/org/alfresco/web/ui/repo/component/property/UIProperty.java
+++ b/source/java/org/alfresco/web/ui/repo/component/property/UIProperty.java
@@ -106,7 +106,7 @@ public class UIProperty extends PropertySheetItem
if (displayLabel == null)
{
// try and get the repository assigned label
- displayLabel = propDef.getTitle();
+ displayLabel = propDef.getTitle(dd.getDictionaryService());
// if the label is still null default to the local name of the property
if (displayLabel == null)
diff --git a/source/web/scripts/ajax/file_picker_widget.js b/source/web/scripts/ajax/file_picker_widget.js
index 183385be44..ced0a8bb9e 100644
--- a/source/web/scripts/ajax/file_picker_widget.js
+++ b/source/web/scripts/ajax/file_picker_widget.js
@@ -207,7 +207,7 @@ _showSelectedValue: function()
this._selectButton.value = (this.value == null
? alfresco.resources["select"]
: alfresco.resources["change"]);
- this._selectButton.title = (null == this.node.widget.labelNode) ? ("") : (this.node.widget.labelNode.getText() + " ") + this._selectButton.value + " " + alfresco.resources["path"];
+ this._selectButton.title = ((null == this.node.widget) || (null == this.node.widget.labelNode)) ? ("") : (this.node.widget.labelNode.getText() + " ") + this._selectButton.value + " " + alfresco.resources["path"];
this._selectButton.disabled = this.readonly;
this._selectButton.style.margin = "0px 10px";
this.node.appendChild(this._selectButton);
@@ -427,7 +427,7 @@ _showPicker: function(data)
cancelButton.filePickerWidget = this;
cancelButton.value = alfresco.resources["cancel"];
- cancelButton.title = (null == this.node.widget.labelNode) ? ("") : (this.node.widget.labelNode.getText() + " ") + alfresco.resources["cancel"];
+ cancelButton.title = ((null == this.node.widget) || (null == this.node.widget.labelNode)) ? ("") : (this.node.widget.labelNode.getText() + " ") + alfresco.resources["cancel"];
footerDiv.appendChild(cancelButton);
cancelButton.style.margin = ((.5 * footerDiv.offsetHeight) -
@@ -515,7 +515,8 @@ _createRow: function(fileName, webappRelativePath, isDirectory, isSelectable, f
e.type = "button";
e.name = webappRelativePath;
e.value = "Select";
- e.title = ((null != this.node.widget.labelNode) ? (this.node.widget.labelNode.getText()) : ("")) + " " + e.value + " " + webappRelativePath;
+ e.title = ((null != this.node.widget) && (null != this.node.widget.labelNode) ? (this.node.widget.labelNode.getText()) : ("")) + " " + e.value + " " + webappRelativePath;
+
result.appendChild(e);
e.style.position = "absolute";
@@ -848,7 +849,7 @@ _showSelectedValue: function()
}
});
this._selectButton.filePickerWidget = this;
- this._selectButton.title = (null == this.node.widget.labelNode) ? ("") : (this.node.widget.labelNode.getText() + " ") + this._selectButton.value + " " + alfresco.resources["path"],
+ this._selectButton.title = ((null == this.node.widget) || (null == this.node.widget.labelNode)) ? ("") : (this.node.widget.labelNode.getText() + " ") + this._selectButton.value + " " + alfresco.resources["path"],
this._selectButton.inject(this.wrapper);
var nodeSize = node.getSize();
var selectButtonSize = this._selectButton.getSize();
@@ -1035,7 +1036,7 @@ _showPicker: function(data)
{
"type" : "button",
"value" : alfresco.resources["cancel"],
- "title": ((null == this.node.widget.labelNode) ? ("") : (this.node.widget.labelNode.getText() + " ") + alfresco.resources["cancel"]),
+ "title": ((null == this.node.widget) || (null == this.node.widget.labelNode) ? ("") : (this.node.widget.labelNode.getText() + " ") + alfresco.resources["cancel"]),
"events" : {
"click" : function(event)
{
@@ -1168,7 +1169,7 @@ _createRow: function(fileName, webappRelativePath, isDirectory, isSelectable, f
}
}
);
- e.title = ((null != this.node.widget.labelNode) ? (this.node.widget.labelNode.getText()) : ("")) + " " + e.value + " " + webappRelativePath;
+ e.title = ((null != this.node.widget) && (null != this.node.widget.labelNode) ? (this.node.widget.labelNode.getText()) : ("")) + " " + e.value + " " + webappRelativePath;
e.inject(result);
}
return result;