Deployment HTTP adapter was putting commas in the port number

Replace some instances of the word "FSR"

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15120 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2009-07-09 16:19:40 +00:00
parent 6c2eafe88b
commit f5ec782c85
3 changed files with 14 additions and 14 deletions

View File

@@ -21,11 +21,11 @@
</bean>
<!-- Transport adapters to communicate with remote File System Receivers -->
<!-- Communicate with an FSR over RMI - Default method for Alfresco-->
<!-- Communicate with an Deployment Server over RMI - Default method for Alfresco-->
<bean id="rmiFSRAdapter" class="org.alfresco.repo.deploy.DeploymentReceiverTransportAdapterRMI">
</bean>
<!-- communicate with an FSR over RMI with the content encrypted -->
<!-- communicate with an Deployment Server over RMI with the content encrypted -->
<bean id="encryptedRMIFSRAdapter" class="org.alfresco.repo.deploy.DeploymentReceiverTransportAdapterRMI">
<property name="transformers">
<list>
@@ -34,7 +34,7 @@
</property>
</bean>
<!-- communicate with an FSR over RMI with the content compressed then encrypted -->
<!-- communicate with an Deployment Server over RMI with the content compressed then encrypted -->
<bean id="compressEncryptedRMIFSRAdapter" class="org.alfresco.repo.deploy.DeploymentReceiverTransportAdapterRMI">
<property name="transformers">
<list>
@@ -44,10 +44,10 @@
</property>
</bean>
<!-- how to communicate with an FSR over Spring HTTP -->
<!-- how to communicate with an Deployment Server over Spring HTTP -->
<bean id="springHttpFSRAdapter" class="org.alfresco.repo.deploy.DeploymentReceiverTransportAdapterSpringHTTP">
<property name="urlPattern">
<value>http://{1}:{2}/alfrescoFSR/deployment</value>
<value>http://{0}:{1}/ADSR/deployment</value>
</property>
</bean>

View File

@@ -39,15 +39,15 @@ public class DeploymentReceiverTransportAdapterHessian extends AbstractDeploymen
/**
* The pattern to use when constructing the URL from hostname and port
*
* eg http://localhost:8080/FSR/deployment
* eg http://localhost:8080/ADSR/deployment
*/
private String urlPattern = "http://{1}:{2}/FSR/deployment";
private String urlPattern = "http://{0}:{1}/ADSR/deployment";
public DeploymentReceiverTransport getTransport(String host,
int port, int version, String srcPath)
{
MessageFormat f = new MessageFormat(urlPattern);
Object[] objs = { host, port };
MessageFormat f = new MessageFormat(getUrlPattern());
Object[] objs = { host, Integer.toString(port) };
String URL = f.format(objs);
// Code to use Hessian transport provided via Spring

View File

@@ -38,17 +38,17 @@ import org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean;
public class DeploymentReceiverTransportAdapterSpringHTTP extends AbstractDeploymentReceiverTransportAdapter implements DeploymentReceiverTransportAdapter {
/**
* The pattern to use when constructing the URL from hostname and port
* {1} substitues for hostname {2} substitues for port
* Default format results in the following URL http://localhost:8080/alfrescoFSR/deployment
* {0} substitues for hostname {1} substitues for port
* Default format results in the following URL http://localhost:8080/ADSR/deployment
*/
private String urlPattern = "http://{1}:{2}/alfrescoFSR/deployment";
private String urlPattern = "http://{0}:{1}/ADSR/deployment";
public DeploymentReceiverTransport getTransport(String host,
int port, int version, String srcPath)
{
MessageFormat f = new MessageFormat(getUrlPattern());
Object[] objs = { host, port };
Object[] objs = { host, Integer.toString(port) };
String URL = f.format(objs);
// Code to use HTTP spring transport