From d24bd442181d6cfeda18f03674c771df73edbac1 Mon Sep 17 00:00:00 2001
From: Brian Rosenberger <bru@brutex.de>
Date: Wed, 22 Aug 2018 08:52:06 +0000
Subject: [PATCH] Fix new version of commons-configurations usage

git-svn-id: https://brutex.net/svn/xservices/trunk@191 e7e49efb-446e-492e-b9ec-fcafc1997a86
---
 .../xservices/ws/rs/OpenAirInfoServiceImpl.java       | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/java/net/brutex/xservices/ws/rs/OpenAirInfoServiceImpl.java b/src/java/net/brutex/xservices/ws/rs/OpenAirInfoServiceImpl.java
index 6bf3695..bafa56b 100644
--- a/src/java/net/brutex/xservices/ws/rs/OpenAirInfoServiceImpl.java
+++ b/src/java/net/brutex/xservices/ws/rs/OpenAirInfoServiceImpl.java
@@ -8,8 +8,9 @@ import javax.ws.rs.core.GenericEntity;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.Response;
 
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.builder.fluent.Configurations;
+import org.apache.commons.configuration2.ex.ConfigurationException;
 import org.apache.commons.jcs.JCS;
 import org.apache.commons.jcs.access.exception.CacheException;
 import org.apache.logging.log4j.LogManager;
@@ -54,6 +55,7 @@ public class OpenAirInfoServiceImpl implements OpenAirInfoService {
 		/*
 		 * get details from configuration file
 		 */
+		Configurations configs = new Configurations();
 		final PropertiesConfiguration props;
 		try {
 			final String config = "../openair.properties";
@@ -62,11 +64,12 @@ public class OpenAirInfoServiceImpl implements OpenAirInfoService {
 
 			final URL configloc = this.getClass().getClassLoader().getResource(config);
 
-			props = new PropertiesConfiguration(configloc);
+			props = configs.properties(configloc);
+			
 			final String user = props.getString("user");
 			final String password = props.getString("password");
 			final String company = props.getString("company");
-			final String apikey = props.getString("apikey", "9x7G49ENkLCJ81i9XZJU");
+			final String apikey = props.getString("apikey", "_PUT_HERE_");
 			final String namespace = props.getString("namespace");
 
 			final OpenAirRestConnection con;