diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties index a82818a070..4a5971d72f 100644 --- a/config/alfresco/messages/webclient.properties +++ b/config/alfresco/messages/webclient.properties @@ -1152,7 +1152,7 @@ deploy_status_failed=FAILED deploy_status_partial=PARTIAL FAILURE reason=Reason snapshot=Snapshot -deploy_to_help=A comma separated list of servers to deploy the website to.

Each entry can be a host name or an IP address and may also contain an RMI port number. If an RMI port number is not specified the default of {0} will be used.

Example: liveserver1, liveserver2:50900

+deploy_to_help=

A comma separated list of servers to deploy the website to. Each entry either represents the location of a Deployment Receiver or an Alfresco Repository.

A file server entry must be prefixed with '\\\\'. Each server can be represented by a host name or an IP address and may also contain an RMI port number. If an RMI port number is not specified for a Deployment Receiver the default of {0} will be used. If an RMI port number is not specified for an Alfresco Repository the default of {1} will be used.

Example: \\\\liveserver1, \\\\liveserver2:44200, liverserver3, liverserver4:50900

content_launch=Content Launch launch_date=Launch Date expiration_date_header=Content Expiration diff --git a/config/alfresco/web-client-config-wcm.xml b/config/alfresco/web-client-config-wcm.xml index 2c3b3d68be..fe932a902e 100644 --- a/config/alfresco/web-client-config-wcm.xml +++ b/config/alfresco/web-client-config-wcm.xml @@ -19,8 +19,10 @@ admin admin - + 50500 + + 44100 2 diff --git a/source/java/org/alfresco/web/bean/wcm/AVMUtil.java b/source/java/org/alfresco/web/bean/wcm/AVMUtil.java index 4038c1df2b..6b6d9d0f00 100644 --- a/source/java/org/alfresco/web/bean/wcm/AVMUtil.java +++ b/source/java/org/alfresco/web/bean/wcm/AVMUtil.java @@ -367,7 +367,7 @@ public final class AVMUtil /** * Returns the default RMI registry port to use when one is not supplied - * for target deployment servers. + * for target Alfresco deployment servers. *

* This value is read from the <wcm> config section in * web-client-config-wcm.xml @@ -404,6 +404,45 @@ public final class AVMUtil return rmiPort; } + /** + * Returns the default RMI port to use when one is not supplied + * for target deployment receivers. + *

+ * This value is read from the <wcm> config section in + * web-client-config-wcm.xml + *

+ * + * @return The deployment receiver RMI port to use for deployments. + * The default is 44100. + */ + public static int getRemoteReceiverRMIPort() + { + int rmiPort = 44100; + + ConfigElement deploymentConfig = getDeploymentConfig(); + if (deploymentConfig != null) + { + ConfigElement elem = deploymentConfig.getChild("receiver-rmi-port"); + if (elem != null) + { + try + { + int value = Integer.parseInt(elem.getValue()); + if (value > 0) + { + rmiPort = value; + } + } + catch (NumberFormatException nfe) + { + // do nothing, just use the default + } + } + } + + return rmiPort; + } + /** * Returns the delay (in seconds) to apply to the start of a deployment * operation (mainly for demo and testing purposes). diff --git a/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java b/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java index ff614429d9..cccca82ce7 100644 --- a/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java +++ b/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java @@ -508,8 +508,9 @@ public class CreateWebsiteWizard extends BaseWizardBean { String pattern = Application.getMessage(FacesContext.getCurrentInstance(), "deploy_to_help"); - String defaultPort = Integer.toString(AVMUtil.getRemoteRMIRegistryPort()); - return MessageFormat.format(pattern, new Object[] {defaultPort}); + String defaultAlfPort = Integer.toString(AVMUtil.getRemoteRMIRegistryPort()); + String defaultReceiverPort = Integer.toString(AVMUtil.getRemoteReceiverRMIPort()); + return MessageFormat.format(pattern, new Object[] {defaultReceiverPort, defaultAlfPort}); } /** diff --git a/source/java/org/alfresco/web/bean/wcm/DeploySnapshotDialog.java b/source/java/org/alfresco/web/bean/wcm/DeploySnapshotDialog.java index f414be0bc1..3202462dcf 100644 --- a/source/java/org/alfresco/web/bean/wcm/DeploySnapshotDialog.java +++ b/source/java/org/alfresco/web/bean/wcm/DeploySnapshotDialog.java @@ -153,6 +153,8 @@ public class DeploySnapshotDialog extends BaseDialogBean args.put(AVMDeploySnapshotAction.PARAM_TARGET_SERVER, targetServer); args.put(AVMDeploySnapshotAction.PARAM_DEFAULT_RMI_PORT, AVMUtil.getRemoteRMIRegistryPort()); + args.put(AVMDeploySnapshotAction.PARAM_DEFAULT_RECEIVER_RMI_PORT, + AVMUtil.getRemoteReceiverRMIPort()); args.put(AVMDeploySnapshotAction.PARAM_REMOTE_USERNAME, AVMUtil.getRemoteDeploymentUsername()); args.put(AVMDeploySnapshotAction.PARAM_REMOTE_PASSWORD, diff --git a/source/java/org/alfresco/web/ui/wcm/component/UIDeploymentReports.java b/source/java/org/alfresco/web/ui/wcm/component/UIDeploymentReports.java index 19dd4c1c27..4b9be4413d 100644 --- a/source/java/org/alfresco/web/ui/wcm/component/UIDeploymentReports.java +++ b/source/java/org/alfresco/web/ui/wcm/component/UIDeploymentReports.java @@ -291,12 +291,12 @@ public class UIDeploymentReports extends SelfRenderingComponent out.write("
 "); out.write(Application.getMessage(context, "details")); out.write("
\n"); out.write("");