/*
   Copyright 2016 Nationale-Nederlanden

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
*/
package nl.nn.adapterframework.configuration;

import java.util.Properties;

import nl.nn.adapterframework.util.AppConstants;
import nl.nn.adapterframework.util.Misc;

import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;

 /**
 * Make the hostname property available to the Ibis configuration and the Spring
 * configuration.
 *
 * @author Jaco de Groot
 */
public class HostnamePropertyPlaceholderConfigurer
		extends PropertyPlaceholderConfigurer {

	public HostnamePropertyPlaceholderConfigurer() {
		setIgnoreUnresolvablePlaceholders(true);
	}

	@Override
	protected void convertProperties(Properties props) {
		AppConstants appConstants = AppConstants.getInstance();
		String hostname = Misc.getHostname();
		appConstants.setPropertyPlaceholderConfigurerProperty("hostname", hostname);
		props.put("hostname", hostname);
	}

}

@@ -759,16 +759,60 @@
 .Misc;%0A%0A
+import org.apache.commons.lang.StringUtils;%0A
 import o
@@ -882,16 +882,16 @@
 igurer;%0A
-
 %0A /**%0A *
@@ -1111,16 +1111,71 @@
 igurer %7B
+%0A%09private static String HOSTNAME_PROPERTY = %22hostname%22;
 %0A%0A%09publi
@@ -1407,16 +1407,122 @@
 stname =
+ appConstants.getResolvedProperty(HOSTNAME_PROPERTY);%0A%09%09if (StringUtils.isEmpty(hostname)) %7B%0A%09%09%09hostname =
  Misc.ge
@@ -1534,16 +1534,17 @@
 name();%0A
+%09
 %09%09appCon
@@ -1591,26 +1591,33 @@
 roperty(
-%22hostname%22
+HOSTNAME_PROPERTY
 , hostna
@@ -1623,16 +1623,17 @@
 ame);%0A%09%09
+%09
 props.pu
@@ -1634,26 +1634,33 @@
 ops.put(
-%22hostname%22
+HOSTNAME_PROPERTY
 , hostna
@@ -1660,18 +1660,22 @@
  hostname);%0A
+%09%09%7D%0A
 %09%7D%0A%0A%7D%0A

Set hostname only when not already present