diff --git a/ivy.xml b/ivy.xml
index 00ee93a..7b48f36 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -34,7 +34,7 @@
-
+
@@ -59,15 +59,15 @@
-
-
-
+
+
+
-
+
-
+
@@ -79,9 +79,12 @@
-
-
-
+
+
+
+
+
+
@@ -96,9 +99,9 @@
-
-
-
+
+
+
@@ -140,8 +143,35 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ivysettings.xml b/ivysettings.xml
index 22fbb58..f49f353 100644
--- a/ivysettings.xml
+++ b/ivysettings.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/lib/DocBuilder-20131001.jar b/lib/DocBuilder-20131001.jar
new file mode 100644
index 0000000..e94f6a4
Binary files /dev/null and b/lib/DocBuilder-20131001.jar differ
diff --git a/src/java/net/brutex/xservices/security/XServicesRealm.java b/src/java/net/brutex/xservices/security/XServicesRealm.java
index 41ae528..60198b2 100644
--- a/src/java/net/brutex/xservices/security/XServicesRealm.java
+++ b/src/java/net/brutex/xservices/security/XServicesRealm.java
@@ -17,30 +17,14 @@
package net.brutex.xservices.security;
+import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.apache.shiro.config.Ini;
+import org.apache.shiro.realm.text.IniRealm;
+import org.apache.shiro.util.Nameable;
import java.net.URI;
import java.net.URISyntaxException;
-import java.net.URL;
-
-import javax.servlet.ServletContext;
-
-import org.apache.catalina.core.ApplicationContext;
-import org.apache.logging.log4j.LogManager;
-import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.authc.AuthenticationInfo;
-import org.apache.shiro.authc.AuthenticationToken;
-import org.apache.shiro.authz.AuthorizationInfo;
-import org.apache.shiro.authz.SimpleAuthorizationInfo;
-import org.apache.shiro.config.Ini;
-import org.apache.shiro.io.ResourceUtils;
-import org.apache.shiro.realm.AuthorizingRealm;
-import org.apache.shiro.realm.text.IniRealm;
-import org.apache.shiro.realm.text.TextConfigurationRealm;
-import org.apache.shiro.subject.PrincipalCollection;
-import org.apache.shiro.util.Nameable;
-import org.apache.shiro.web.env.IniWebEnvironment;
-import org.apache.shiro.web.util.WebUtils;
// TODO: Auto-generated Javadoc
/*
diff --git a/src/java/net/brutex/xservices/types/StringMatchType.java b/src/java/net/brutex/xservices/types/StringMatchType.java
index de23688..d372933 100644
--- a/src/java/net/brutex/xservices/types/StringMatchType.java
+++ b/src/java/net/brutex/xservices/types/StringMatchType.java
@@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlType;
@XmlType
public class StringMatchType
{
- public final List stringlist = new ArrayList();
+ public final List stringlist = new ArrayList();
public int size = 0;
public synchronized void addStringMatch(StringMatchDetails match)
diff --git a/src/java/net/brutex/xservices/util/BrutexHSQLQuartzConnectionProvider.java b/src/java/net/brutex/xservices/util/BrutexHSQLQuartzConnectionProvider.java
index 14ce0ae..51b4d8c 100644
--- a/src/java/net/brutex/xservices/util/BrutexHSQLQuartzConnectionProvider.java
+++ b/src/java/net/brutex/xservices/util/BrutexHSQLQuartzConnectionProvider.java
@@ -177,11 +177,7 @@ public class BrutexHSQLQuartzConnectionProvider implements ConnectionProvider {
return false;
}
- @Override
- public void initialize() throws SQLException {
- // TODO Auto-generated method stub
-
- }
+
}
diff --git a/src/java/net/brutex/xservices/util/BrutexQuartzConnectionProvider.java b/src/java/net/brutex/xservices/util/BrutexQuartzConnectionProvider.java
index f67d91b..733080d 100644
--- a/src/java/net/brutex/xservices/util/BrutexQuartzConnectionProvider.java
+++ b/src/java/net/brutex/xservices/util/BrutexQuartzConnectionProvider.java
@@ -177,11 +177,6 @@ public class BrutexQuartzConnectionProvider implements ConnectionProvider {
return false;
}
- @Override
- public void initialize() throws SQLException {
- // TODO Auto-generated method stub
-
- }
}
diff --git a/src/java/net/brutex/xservices/util/OpenAirConnection.java b/src/java/net/brutex/xservices/util/OpenAirConnection.java
index 5a53ab7..d054346 100644
--- a/src/java/net/brutex/xservices/util/OpenAirConnection.java
+++ b/src/java/net/brutex/xservices/util/OpenAirConnection.java
@@ -3,10 +3,14 @@
*/
package net.brutex.xservices.util;
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
import java.net.URL;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.PropertiesConfiguration;
import org.apache.commons.jcs.JCS;
import org.apache.commons.jcs.access.exception.CacheException;
import org.apache.logging.log4j.LogManager;
@@ -29,7 +33,9 @@ public final class OpenAirConnection {
final URL configloc = OpenAirConnection.class.getClassLoader().getResource(config);
logger.debug("Loading Open Air connection details from {}", configloc.toString());
- props = new PropertiesConfiguration(configloc);
+ props = new PropertiesConfiguration();
+ props.read( new InputStreamReader( new BufferedInputStream(configloc.openStream())) );
+
final String user = props.getString("user");
final String password = props.getString("password");
final String company = props.getString("company");
@@ -46,6 +52,8 @@ public final class OpenAirConnection {
} catch (ConfigurationException e) {
logger.error(e.getMessage(), e);
e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
} finally {
}
diff --git a/src/java/net/brutex/xservices/ws/impl/OpenAirProxyServiceImpl.java b/src/java/net/brutex/xservices/ws/impl/OpenAirProxyServiceImpl.java
index 3ea6a09..c08fafd 100644
--- a/src/java/net/brutex/xservices/ws/impl/OpenAirProxyServiceImpl.java
+++ b/src/java/net/brutex/xservices/ws/impl/OpenAirProxyServiceImpl.java
@@ -15,6 +15,9 @@
*/
package net.brutex.xservices.ws.impl;
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
import java.net.URL;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
@@ -27,8 +30,8 @@ import javax.activation.DataHandler;
import javax.jws.WebParam;
import javax.jws.WebService;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.PropertiesConfiguration;
import org.apache.commons.jcs.JCS;
import org.apache.commons.jcs.access.exception.CacheException;
import org.apache.logging.log4j.LogManager;
@@ -464,7 +467,8 @@ public class OpenAirProxyServiceImpl implements OpenAirProxyService {
final URL configloc = this.getClass().getClassLoader().getResource(config);
- props = new PropertiesConfiguration(configloc);
+ props = new PropertiesConfiguration();
+ props.read( new InputStreamReader( new BufferedInputStream( configloc.openStream() )));
final String user = props.getString("user");
final String password = props.getString("password");
final String company = props.getString("company");
@@ -481,6 +485,9 @@ public class OpenAirProxyServiceImpl implements OpenAirProxyService {
} catch (ConfigurationException e) {
logger.error(e);
e.printStackTrace();
+ } catch (IOException e) {
+ logger.error(e);
+ e.printStackTrace();
} finally {
}