Merged V2.2 to HEAD

8265: Added catch blocks for the permissions service access denied exception to various file/folder operations
   8286: Merged V2.1 to V2.2
      8256: Fix broken WCM workflow.
      8257: Partial fix for AWC-1850
      8283: Merged V2.1-A to V2.1
         8264: Fine-grained debug logging for exceptions causing transaction retries.
   8288: Should fix workflow problems. Hard to test since almost nothing works right now.
   8291: Added Peter's fixes to improve deployment start scripts
   8294: Update deploy script from Peter
   8298: Fix for WCM-1058:
   8300: Commented out admin dashlet (active_tasks)
   8359: Fix AR-1735: Customer-requested POI upgrade
   8367: Fix for AWC-1639
   8368: Fix for WCM-1102
   8389: Revert changes between r8072 and r8251 from Schema2XForms.java
   8401: Fix for WCM-1105
   8407: Minor typo fix


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

config/alfresco/web-client-config.xml

@@ -232,8 +232,10 @@
             <!-- this dashlet 'tasks-todo' is also shown by default for all users -->
             <dashlet id="tasks-todo" label-id="my_tasks_todo_title" description-id="my_tasks_todo_desc"
                   jsp="/jsp/workflow/tasks-todo-dashlet.jsp" allow-narrow="false" />
+            <!-- Not enabled by default
 			<dashlet id="tasks-active" label-id="tasks_active_title" description-id="tasks_active_desc"
                   jsp="/jsp/workflow/tasks-active-dashlet.jsp" allow-narrow="false" />
+			-->
             <dashlet id="pooled-tasks" label-id="pooled_tasks_title" description-id="pooled_tasks_desc"
                   jsp="/jsp/workflow/pooled-tasks-todo-dashlet.jsp" allow-narrow="false" />
             <dashlet id="tasks-completed" label-id="my_tasks_completed_title" description-id="my_tasks_completed_desc"

source/java/org/alfresco/web/app/Application.java

@@ -643,6 +643,11 @@ public class Application
             {
                locale = I18NUtil.parseLocale(strLocale);
             }
+            else
+            {
+               // failing that, use the server default locale
+               locale = Locale.getDefault();
+            }
          }
          else
          {
@@ -689,6 +694,11 @@ public class Application
             {
                locale = I18NUtil.parseLocale(strLocale);
             }
+            else
+            {
+               // failing that, use the server default locale
+               locale = Locale.getDefault();
+            }
          }
          else
          {

source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java

@@ -1234,7 +1234,11 @@ public class CreateWebsiteWizard extends BaseWizardBean
          this.formsDataModel = new ListDataModel();
       }
       
+      // only set the wrapped data once otherwise the row index gets reset
+      if (this.formsDataModel.getWrappedData() == null)
+      {
          this.formsDataModel.setWrappedData(this.forms);
+      }
       
       return this.formsDataModel;
    }
@@ -1341,7 +1345,7 @@ public class CreateWebsiteWizard extends BaseWizardBean
     */
    public void setupWorkflowAction(ActionEvent event)
    {
-      setActionWorkflow( (WorkflowConfiguration)this.workflowsDataModel.getRowData() );
+      setActionWorkflow( (WorkflowConfiguration)this.getWorkflowsDataModel().getRowData());
    }
    
    /**
@@ -1374,7 +1378,11 @@ public class CreateWebsiteWizard extends BaseWizardBean
          this.workflowsDataModel = new ListDataModel();
       }
       
+      // only set the wrapped data once otherwise the row index gets reset
+      if (this.workflowsDataModel.getWrappedData() == null)
+      {
          this.workflowsDataModel.setWrappedData(this.workflows);
+      }
       
       return this.workflowsDataModel;
    }

source/java/org/alfresco/web/bean/wcm/ManageReviewTaskDialog.java

@@ -200,9 +200,18 @@ public class ManageReviewTaskDialog extends ManageTaskDialog
       FacesContext context = FacesContext.getCurrentInstance();
       Map request = context.getExternalContext().getRequestMap();
       if (request.get(AVMBrowseBean.REQUEST_BEEN_DEPLOYED_RESULT) == null)
+      {
+         result = Boolean.FALSE;
+         
+         if (this.webProjectRef != null)
          {
             List<NodeRef> testServers = DeploymentUtil.findTestServers(this.webProjectRef, false);
+            if (testServers != null)
+            {
                result = new Boolean(testServers != null && testServers.size() > 0);
+            }
+         }
+         
          request.put(AVMBrowseBean.REQUEST_BEEN_DEPLOYED_RESULT, result);
       }
       else

source/java/org/alfresco/web/forms/xforms/Schema2XForms.java

@@ -2804,6 +2804,10 @@ public class Schema2XForms implements Serializable
                                        typeName);
          }
          final StringList lexicalPatterns = ((XSSimpleTypeDefinition)controlType).getLexicalPattern();
+         for (int i = 0; lexicalPatterns != null && i < lexicalPatterns.getLength(); i++)
+         {
+            constraints.add("chiba:match(., '" + lexicalPatterns.item(i) + "',null)");
+         }
       }
 
       final short constraintType =

source/java/org/alfresco/web/ui/repo/component/UIWorkflowHistory.java

@@ -131,7 +131,7 @@ public class UIWorkflowHistory extends SelfRenderingComponent
          else
          {
             // output surrounding table and style if necessary
-            out.write("<table cellspacing='2' cellpadding='1' border='0' width='100%'");
+            out.write("<table cellspacing='2' cellpadding='1' border='0'");
             if (this.getAttributes().get("style") != null)
             {
                out.write(" style=\"");

source/web/css/main.css

@@ -622,10 +622,12 @@ a.topToolbarLinkHighlight, a.topToolbarLinkHighlight:link, a.topToolbarLinkHighl
 {
    margin-left: 18px;
    margin-top: 6px;
+   margin-right: 4px;
    background-color: #f5f5f5;
    border-width: 1px;
    border-style: solid;
    border-color: #DDDDDD;
+   width: auto;
 }
 
 #pluginBox