From: <fg...@us...> - 2011-08-12 09:09:05
|
Revision: 3611 http://openutils.svn.sourceforge.net/openutils/?rev=3611&view=rev Author: fgiust Date: 2011-08-12 09:08:59 +0000 (Fri, 12 Aug 2011) Log Message: ----------- DEPLOY-8 system properties are now set when "exposeSystemProperties" is true and a warning is logged when an existing property is overwritten Modified Paths: -------------- trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java Modified: trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java =================================================================== --- trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java 2011-08-12 09:04:05 UTC (rev 3610) +++ trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java 2011-08-12 09:08:59 UTC (rev 3611) @@ -216,22 +216,38 @@ hostname = StringUtils.substringBefore( StringUtils.lowerCase(InetAddress.getLocalHost().getHostName()), "."); - initParametersMap.put("${" + serverPropertyName + "}", hostname); } catch (UnknownHostException e) { log.error(e.getMessage()); // should not happen } + String applName = getApplicationName(); if (hostname != null) { - System.setProperty(serverPropertyName, hostname); + if (exposeSystemProperties) + { + if (System.getProperty(serverPropertyName) != null) + { + log.warn("Overwriting system property {}", serverPropertyName); + } + System.setProperty(serverPropertyName, hostname); + } + initParametersMap.put("${" + serverPropertyName + "}", hostname); } - String applName = getApplicationName(); if (applName != null) { - System.setProperty(applicationPropertyName, applName); + + if (exposeSystemProperties) + { + if (System.getProperty(applicationPropertyName) != null) + { + log.warn("Overwriting system property {}", applicationPropertyName); + } + System.setProperty(applicationPropertyName, applName); + } + initParametersMap.put("${" + applicationPropertyName + "}", applName); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |