Subversion Repositories XServices

Compare Revisions

Ignore whitespace Rev 195 → Rev 197

/xservices/trunk/src/java/net/brutex/xservices/security/XServicesRealm.java
17,31 → 17,15
 
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
/*
* For later use. A Realm connects to a DS where Users/ Passes are defined
/xservices/trunk/src/java/net/brutex/xservices/types/StringMatchType.java
29,7 → 29,7
@XmlType
public class StringMatchType
{
public final List<StringMatchDetails> stringlist = new ArrayList();
public final List<StringMatchDetails> stringlist = new ArrayList<StringMatchDetails>();
public int size = 0;
 
public synchronized void addStringMatch(StringMatchDetails match)
/xservices/trunk/src/java/net/brutex/xservices/util/BrutexHSQLQuartzConnectionProvider.java
177,11 → 177,7
return false;
}
 
@Override
public void initialize() throws SQLException {
// TODO Auto-generated method stub
}
 
}
 
 
/xservices/trunk/src/java/net/brutex/xservices/util/BrutexQuartzConnectionProvider.java
177,11 → 177,6
return false;
}
 
@Override
public void initialize() throws SQLException {
// TODO Auto-generated method stub
}
}
 
 
/xservices/trunk/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
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
} catch (ConfigurationException e) {
logger.error(e.getMessage(), e);
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
} finally {
 
}
/xservices/trunk/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.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
 
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
} catch (ConfigurationException e) {
logger.error(e);
e.printStackTrace();
} catch (IOException e) {
logger.error(e);
e.printStackTrace();
} finally {
 
}