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;