Merged V2.0 to HEAD

5456: (From WCM_DEPLOY)

There were many pure conflicts on license headers, one conflict due to CR-LF and
some other smaller issues to resolve:
-----------------------------------------
Resolved (line endings not cr-lf):
   root\projects\repository\config\alfresco\public-services-context.xml

Reverted:
   root\projects\web-client\source\web\images\icons\ajax_anim.gif

Reverted or Resolved (License text conflicts):
   svn revert root\projects\jndi-client\source\java\org\alfresco\jndi\JndiTest.java
   svn resolved root\projects\jndi-client\source\java\org\alfresco\jndi\AVMFileDirContext.java
   svn revert root\projects\jndi-client\source\java\org\alfresco\jndi\AVMBulkLoader.java
   svn revert root\projects\jndi-client\source\java\org\alfresco\filter\CacheControlFilter.java
   svn revert root\projects\jndi-client\source\java\org\alfresco\filter\CacheControlFilterInfoBean.java
   svn revert -R root\projects\catalina-virtual\source\java\org\alfresco\mbeans
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\context\AVMStandardContext.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\loader\AVMWebappClassLoader.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\loader\AVMWebappLoader.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMResourceBinding.java
   svn resolved root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMHostConfig.java
      - why the change in method naming convention?
   svn resolved root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMHost.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\DefaultAVMResourceBinding.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\valve\AVMUrlValveTest.java
   svn resolved root\projects\catalina-virtual\source\java\org\alfresco\catalina\valve\AVMUrlValve.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMHostMatch.java

Modified:
   root\projects\web-client\source\java\org\alfresco\web\ui\wcm\component\UIDeployWebsite.java (Kevin to check line 330)


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

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

@@ -25,6 +25,7 @@
 package org.alfresco.web.bean.wcm;
 
 import java.io.Serializable;
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -75,10 +76,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public class CreateWebsiteWizard extends BaseWizardBean
 {
-   private static final String MSG_DESCRIPTION = "description";
-   private static final String MSG_NAME = "name";
    private static final String MSG_USERROLES = "create_website_summary_users";
-   private static final String MSG_NONE = "workflow_not_set";
    
    private static final String COMPONENT_FORMLIST = "form-list";
    private static final String COMPONENT_WORKFLOWLIST = "workflow-list";
@@ -96,6 +94,7 @@ public class CreateWebsiteWizard extends BaseWizardBean
    protected String name;
    protected String description;
    protected String webapp = WEBAPP_DEFAULT;
+   protected List<String> deployTo;
    
    protected String websitesFolderId = null;
    
@@ -145,6 +144,7 @@ public class CreateWebsiteWizard extends BaseWizardBean
       this.dnsName = null;
       this.title = null;
       this.description = null;
+      this.deployTo = null;
       this.formsDataModel = null;
       this.forms = new ArrayList<FormWrapper>(8);
       this.workflowsDataModel = null;
@@ -187,6 +187,9 @@ public class CreateWebsiteWizard extends BaseWizardBean
       String webapp = (this.webapp != null && this.webapp.length() != 0) ? this.webapp : WEBAPP_DEFAULT;
       this.nodeService.setProperty(nodeRef, WCMAppModel.PROP_DEFAULTWEBAPP, webapp);
       
+      // set the list of servers to deploy to
+      this.nodeService.setProperty(nodeRef, WCMAppModel.PROP_DEPLOYTO, (Serializable)this.deployTo);
+      
       // call a delegate wizard bean to provide invite user functionality
       InviteWebsiteUsersWizard wiz = getInviteUsersWizard();
       wiz.setNode(new Node(nodeRef));
@@ -469,10 +472,39 @@ public class CreateWebsiteWizard extends BaseWizardBean
    {
       this.webapp = webapp;
    }
+   
+   /**
+    * @return The comma separated list of servers to deploy to
+    */
+   public List<String> getDeployTo()
+   {
+      return this.deployTo;
+   }
 
+   /**
+    * @param deployTo The comma separated list of servers to deploy to
+    */
+   public void setDeployTo(List<String> deployTo)
+   {
+      this.deployTo = deployTo;
+   }
+
+   /**
+    * @return the deploy to help text that gets displayed if the user
+    * clicks the Help icon
+    */
+   public String getDeployToHelp()
+   {
+      String pattern = Application.getMessage(FacesContext.getCurrentInstance(), 
+               "deploy_to_help");
+      String defaultPort = Integer.toString(AVMConstants.getRemoteRMIRegistryPort());
+      return MessageFormat.format(pattern, new Object[] {defaultPort});
+   }
+   
    /**
     * @return summary text for the wizard
     */
+   @SuppressWarnings("unchecked")
    public String getSummary()
    {
       FacesContext fc = FacesContext.getCurrentInstance();
@@ -506,6 +538,7 @@ public class CreateWebsiteWizard extends BaseWizardBean
    /**
     * @return the invited users for the project - as UserWrapper instances
     */
+   @SuppressWarnings("unchecked")
    public List<UserWrapper> getInvitedUsers()
    {
       final FacesContext fc = FacesContext.getCurrentInstance();