Merged V2.1 to HEAD

6327: Drops alfresco-deployment.zip in build/dist instead of build.
   6328:Set AVM file name requirements as lenient as possible.
   6329: Fixed DNS name restriction to allow 1-char host labels.
   6330: Setting read-only flag for start up components (AR-1621 and AR-193)
   6331: Minor formatting
   6332: Implementation of a read-only, HTTP-based ContentStore.
   6333: AR-1619: A debug message needed changing as the FileFolderService now supports adding children onto system nodes.
   6334: Build fix
   6335: Fix for AWC-1447 (Office Add-In - Create Collaboration Space)
   6337: Fixed AR-1622: WebService requests must be wrapped in retries


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

source/web/jsp/wcm/create-website-wizard/details.jsp

@@ -48,7 +48,7 @@
    function checkButtonState()
    {
       if (document.getElementById("wizard:wizard-body:name").value.length == 0 ||
-          document.getElementById("wizard:wizard-body:dnsname").value.length < 2)
+          document.getElementById("wizard:wizard-body:dnsname").value.length < 1)
       {
          document.getElementById("wizard:next-button").disabled = true;
       }
@@ -69,7 +69,7 @@
          if (valid == true)
          {
             valid = validateRegex(document.getElementById("wizard:wizard-body:dnsname"),
-                  "^[a-zA-Z0-9][a-zA-Z0-9-]{0,61}[a-zA-Z0-9]$", true, null,
+                  "^[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?$", true, null,
                   '</f:verbatim><a:outputText value="#{msg.validation_invalid_dns_name}" /><f:verbatim>', true);
          }
          return valid;
@@ -194,4 +194,4 @@
       </td>
    </tr>
 </table>
-</f:verbatim>
+</f:verbatim>