38,12 → 38,14 |
import net.brutex.xservices.types.scmfindings.GroupMatchListType; |
import net.brutex.xservices.types.scmfindings.ObjectFactory; |
import net.brutex.xservices.ws.rs.CVSInfoImpl; |
import org.apache.commons.configuration.ConfigurationException; |
import org.apache.commons.configuration.PropertiesConfiguration; |
import org.apache.jcs.JCS; |
import org.apache.jcs.access.exception.CacheException; |
import org.apache.log4j.Logger; |
|
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.access.exception.CacheException; |
import org.apache.logging.log4j.LogManager; |
import org.apache.logging.log4j.Logger; |
|
/** |
* @author Brian Rosenberger, bru(at)brutex.de |
* |
52,8 → 54,7 |
public class FindingsCacheServlet extends HttpServlet { |
|
private static final long serialVersionUID = 4041338473949999960L; |
private final static Logger logger = Logger |
.getLogger(FindingsCacheServlet.class); |
private static final Logger logger = LogManager.getLogger(); |
private final List<File> configfiles = new ArrayList<File>(); |
private final ObjectFactory FACTORY = new ObjectFactory(); |
private ExecutorService executor; |
70,7 → 71,7 |
int i = 1; |
for(File f: configfiles) { |
//Initialise configuration bean using default values |
FindingsConfigBean cbean = new FindingsConfigBean(i, Logger.getLogger("worker-"+i+ "." + this.getClass().getName())); |
FindingsConfigBean cbean = new FindingsConfigBean(i, LogManager.getLogger("worker-"+i+ "." + this.getClass().getName())); |
i++; |
|
|
86,9 → 87,10 |
+ cbean.getCacheinterval()+ "' minutes"); |
} |
|
Configurations configs = new Configurations(); |
PropertiesConfiguration config = null; |
try { |
config = new PropertiesConfiguration(f); |
config = configs.properties(f); |
} catch (ConfigurationException e) { |
logger.error("Could not read parameter file at '"+f.getAbsolutePath()+"'"); |
return; |