Author: sletellier Date: 2011-05-26 17:11:59 +0200 (Thu, 26 May 2011) New Revision: 56 Url: http://chorem.org/repositories/revision/vradi/56 Log: - Fix using on remote Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/VradiServiceConfigurationHelper.java trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiServiceFactory.java trunk/vradi-swing/src/main/resources/vradi.properties Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/VradiServiceConfigurationHelper.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/VradiServiceConfigurationHelper.java 2011-05-26 14:55:23 UTC (rev 55) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/VradiServiceConfigurationHelper.java 2011-05-26 15:11:59 UTC (rev 56) @@ -277,6 +277,7 @@ /** * Get remote service port. + * (was for cajo use) * * @param config vradi swing configuration * @return remote service port Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiServiceFactory.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiServiceFactory.java 2011-05-26 14:55:23 UTC (rev 55) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiServiceFactory.java 2011-05-26 15:11:59 UTC (rev 56) @@ -92,10 +92,9 @@ factory.setOverloadEnabled(true); // vradi service - int servicePort = VradiServiceConfigurationHelper.getServicePort(VradiServiceConfiguration.getConfig()); result = (VradiStorageService) factory. create(VradiStorageService.class, - getServiceURL(serviceEndpoint, servicePort, VradiStorageService.VRADI_SERVICE)); + getServiceURL(serviceEndpoint, VradiStorageService.VRADI_SERVICE)); } catch (Exception eee) { if (log.isErrorEnabled()) { @@ -142,9 +141,8 @@ FileService fileService; String serviceEndpoint = VradiServiceConfigurationHelper.getRemoteEndpoint(config); if (isValidUrl(serviceEndpoint)) { - int servletPort = VradiServiceConfigurationHelper.getServletPort(config); // file service - String fileServiceUrl = getServiceURL(serviceEndpoint, servletPort, "file"); + String fileServiceUrl = getServiceURL(serviceEndpoint, "file"); log.info("File service url : " + fileServiceUrl); fileService = new FileServiceProxy(fileServiceUrl); } else { @@ -164,14 +162,9 @@ * @param serviceEndUrl service small name * @return service full url */ - protected static String getServiceURL(String serviceEndpoint, int port, String serviceEndUrl) { + protected static String getServiceURL(String serviceEndpoint, String serviceEndUrl) { String fullUrl = serviceEndpoint; - // Add port if != 0 - if (port != 0) { - fullUrl += ":" + port; - } - // Warn hessian won't work with double / if (!fullUrl.endsWith("/")) { fullUrl += "/"; Modified: trunk/vradi-swing/src/main/resources/vradi.properties =================================================================== --- trunk/vradi-swing/src/main/resources/vradi.properties 2011-05-26 14:55:23 UTC (rev 55) +++ trunk/vradi-swing/src/main/resources/vradi.properties 2011-05-26 15:11:59 UTC (rev 56) @@ -40,7 +40,7 @@ wikitty.service.event.listen=true wikitty.service.event.propagate.transporter=org.nuiton.wikitty.services.XMPPNotifierTransporter wikitty.WikittyServiceCached.components=org.nuiton.wikitty.services.WikittyCacheJCS -wikitty.service.server.url=${vradi.remote.endpoint}:${vradi.remote.service.port}/wikittyservice +wikitty.service.server.url=${vradi.remote.endpoint}/wikittyservice wikitty.service.cache.priority.extensions=Thesaurus, User, Status, XmlStream jcs.default= jcs.default.cacheattributes.MaxObjects=1000