Merged V2.2 to HEAD

8146: Interim checkin for Oracle upgrade scripts.
   8150: AR-1905
   8151: AR-1956
   8152: Correct I18N when reporting patch description
   8153: QName script for Oracle along with fixes for unique constraints on assoc tables
   8155: Upgrade scripts for Oracle V2.2 - almost there
   8164: AWC-1633: Unable to edit rule added via web service
   8166: V2.2 upgrade scripts for MySQL and Oracle
   8170: AWC-1515: E-mail doesn't reach user's mail box, if it was created with the help of templates
   8174: Fix for AWC-798
   8180: Fix for AWC-1843
   8183: Fixes for different unique index names on alf_child_assoc
   8189: AWC-1719: Need to alllow Rules to account for a space being deleted
   8249: Fixed handling of empty namespaces on Oracle
   8259: Fixes for null namespaces in QName
   8360: Modified alf_audit_date columns and added patch
   8404: Fix AR-2133: Fix handling of empty namespaces during upgrade


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8481 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/templates/email/invite_user_email.ftl

@@ -1,6 +1,6 @@
 You have been invited to '${space.name}' by ${person.properties.firstName}<#if person.properties.lastName?exists> ${person.properties.lastName}</#if>.
 
-You will have the role of: ${role}
+<#if role?exists>You will have the role of: ${role}</#if>
 
 You can view the space through the Alfresco client:
 <#assign ref=space.nodeRef>

source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java

@@ -169,7 +169,7 @@ public final class AuthenticationHelper
                   NodeRef guestHomeRef = (NodeRef)nodeService.getProperty(guestRef, ContentModel.PROP_HOMEFOLDER);
                   
                   // check that the home space node exists - else Guest cannot proceed
-                  if (nodeService.exists(guestHomeRef) == false)
+                  if (guestHomeRef == null || nodeService.exists(guestHomeRef) == false)
                   {
                      // cannot login as Guest as Home is missing - return to login screen
                      logger.warn("Unable to locate Guest Home space - may have been deleted?");

source/java/org/alfresco/web/bean/repository/Repository.java

@@ -209,20 +209,24 @@ public final class Repository
    {
       String name = null;
       
-      // try to find a display "name" property for this node
+      // Check that node reference still exists
-      Object nameProp = nodeService.getProperty(ref, ContentModel.PROP_NAME);
+      if (nodeService.exists(ref) == true)
-      if (nameProp != null)
+      {      
-      {
+          // try to find a display "name" property for this node
-         name = nameProp.toString();
+          Object nameProp = nodeService.getProperty(ref, ContentModel.PROP_NAME);
-      }
+          if (nameProp != null)
-      else
+          {
-      {
+             name = nameProp.toString();
-         // revert to using QName if not found
+          }
-         QName qname = nodeService.getPrimaryParent(ref).getQName();
+          else
-         if (qname != null)
+          {
-         {
+             // revert to using QName if not found
-            name = qname.getLocalName();
+             QName qname = nodeService.getPrimaryParent(ref).getQName();
-         }
+             if (qname != null)
+             {
+                name = qname.getLocalName();
+             }
+          }
       }
       
       return name;

source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java

@@ -561,65 +561,73 @@ public class CreateSpaceWizard extends BaseWizardBean
                for (ConfigElement child : typesCfg.getChildren())
                {
                   QName idQName = Repository.resolveToQName(child.getAttribute("name"));
-                  TypeDefinition typeDef = this.getDictionaryService().getType(idQName);
+                  if (idQName != null)
-
-                  if (typeDef != null)
                   {
-                     if (this.getDictionaryService().isSubClass(typeDef.getName(), ContentModel.TYPE_FOLDER))
+                     TypeDefinition typeDef = this.getDictionaryService().getType(idQName);
+   
+                     if (typeDef != null)
                      {
-                        // try and get the label from config
+                        if (this.getDictionaryService().isSubClass(typeDef.getName(), ContentModel.TYPE_FOLDER))
-                        String label = Utils.getDisplayLabel(context, child);
-
-                        // if there wasn't a client based label try and get it from the dictionary
-                        if (label == null)
                         {
-                           label = typeDef.getTitle();
+                           // try and get the label from config
+                           String label = Utils.getDisplayLabel(context, child);
+   
+                           // if there wasn't a client based label try and get it from the dictionary
+                           if (label == null)
+                           {
+                              label = typeDef.getTitle();
+                           }
+   
+                           // finally use the localname if we still haven't found a label
+                           if (label == null)
+                           {
+                              label = idQName.getLocalName();
+                           }
+   
+                           // resolve a description string for the type
+                           String description = Utils.getDescription(context, child);
+   
+                           // if we don't have a local description just use the label
+                           if (description == null)
+                           {
+                              description = label;
+                           }
+   
+                           // extract the icon to use from the config
+                           String icon = child.getAttribute("icon");
+                           if (icon == null || icon.length() == 0)
+                           {
+                              icon = DEFAULT_SPACE_TYPE_ICON_PATH;
+                           }
+   
+                           UIListItem item = new UIListItem();
+                           item.setValue(idQName.toString());
+                           item.setLabel(label);
+                           item.setTooltip(label);
+                           item.setImage(icon);
+                           this.folderTypes.add(item);
+   
+                           UIDescription desc = new UIDescription();
+                           desc.setControlValue(idQName.toString());
+                           desc.setText(description);
+                           this.folderTypeDescriptions.add(desc);
                         }
-
+                        else
-                        // finally use the localname if we still haven't found a label
-                        if (label == null)
                         {
-                           label = idQName.getLocalName();
+                           logger.warn("Failed to add '" + child.getAttribute("name") +
+                                 "' to the list of folder types as the type is not a subtype of cm:folder");
                         }
-
-                        // resolve a description string for the type
-                        String description = Utils.getDescription(context, child);
-
-                        // if we don't have a local description just use the label
-                        if (description == null)
-                        {
-                           description = label;
-                        }
-
-                        // extract the icon to use from the config
-                        String icon = child.getAttribute("icon");
-                        if (icon == null || icon.length() == 0)
-                        {
-                           icon = DEFAULT_SPACE_TYPE_ICON_PATH;
-                        }
-
-                        UIListItem item = new UIListItem();
-                        item.setValue(idQName.toString());
-                        item.setLabel(label);
-                        item.setTooltip(label);
-                        item.setImage(icon);
-                        this.folderTypes.add(item);
-
-                        UIDescription desc = new UIDescription();
-                        desc.setControlValue(idQName.toString());
-                        desc.setText(description);
-                        this.folderTypeDescriptions.add(desc);
                      }
                      else
                      {
                         logger.warn("Failed to add '" + child.getAttribute("name") +
-                              "' to the list of folder types as the type is not a subtype of cm:folder");
+                              "' to the list of folder types as the type is not recognised");
                      }
                   }
                   else
                   {
                      logger.warn("Failed to add '" + child.getAttribute("name") +
-                           "' to the list of folder types as the type is not recognised");
+                              "' to the list of folder types as the prefix can not be resolved");
                   }
                }
             }