Merged V2.2 to HEAD

7452: Fixes submit breakage.
   7456: Patch to redeploy new submission workflow definition
   7457: Added 'View Deployment' action to workflow sandbox so reviewers can examine the last attempted deployment
         Added 'Allocated' field to server config, tooltip shows which store the test server is allocated to


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

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

@@ -39,6 +39,8 @@ import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.util.ISO9075;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.repository.Repository;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 
 /**
@@ -48,6 +50,8 @@ import org.alfresco.web.bean.repository.Repository;
  */
 public final class DeploymentUtil
 {
+   private static final Log logger = LogFactory.getLog(DeploymentUtil.class);
+   
    public static List<NodeRef> findDeploymentAttempts(String store)
    {
       FacesContext fc = FacesContext.getCurrentInstance();
@@ -170,8 +174,12 @@ public final class DeploymentUtil
          }
          else if (results.length() > 1)
          {
-            throw new IllegalStateException("More than one allocated test server for store '" +
-                     store + "' was found, should only be one!");
+            // get the first one and warn that we found many!
+            testServer = results.getNodeRef(0);
+            
+            if (logger.isWarnEnabled())
+               logger.warn("More than one allocated test server for store '" +
+                     store + "' was found, should only be one, first one found returned!");
          }
       }
       finally