/xservices/trunk/src/java/net/brutex/xservices/util/cache/FindingsCacheServlet.java |
---|
38,14 → 38,12 |
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 |
* |
54,7 → 52,8 |
public class FindingsCacheServlet extends HttpServlet { |
private static final long serialVersionUID = 4041338473949999960L; |
private static final Logger logger = LogManager.getLogger(); |
private final static Logger logger = Logger |
.getLogger(FindingsCacheServlet.class); |
private final List<File> configfiles = new ArrayList<File>(); |
private final ObjectFactory FACTORY = new ObjectFactory(); |
private ExecutorService executor; |
71,7 → 70,7 |
int i = 1; |
for(File f: configfiles) { |
//Initialise configuration bean using default values |
FindingsConfigBean cbean = new FindingsConfigBean(i, LogManager.getLogger("worker-"+i+ "." + this.getClass().getName())); |
FindingsConfigBean cbean = new FindingsConfigBean(i, Logger.getLogger("worker-"+i+ "." + this.getClass().getName())); |
i++; |
87,10 → 86,9 |
+ cbean.getCacheinterval()+ "' minutes"); |
} |
Configurations configs = new Configurations(); |
PropertiesConfiguration config = null; |
try { |
config = configs.properties(f); |
config = new PropertiesConfiguration(f); |
} catch (ConfigurationException e) { |
logger.error("Could not read parameter file at '"+f.getAbsolutePath()+"'"); |
return; |
/xservices/trunk/src/java/net/brutex/xservices/util/cache/CacheExecutorService.java |
---|
28,28 → 28,33 |
* |
*/ |
public class CacheExecutorService implements ServletContextListener { |
static final String EXECUTOR_NAME = "CACHE_EXECUTOR"; |
private ExecutorService executor; |
public void contextInitialized(ServletContextEvent arg0) { |
ServletContext context = arg0.getServletContext(); |
int nr_executors = 5; |
ThreadFactory daemonFactory = new DaemonThreadFactory(); |
try { |
nr_executors = Integer.parseInt(context.getInitParameter("cache:thread-count")); |
} catch (NumberFormatException localNumberFormatException) { |
} |
if (nr_executors <= 1) |
this.executor = Executors.newSingleThreadExecutor(daemonFactory); |
else { |
this.executor = Executors.newFixedThreadPool(nr_executors, daemonFactory); |
} |
context.setAttribute("CACHE_EXECUTOR", this.executor); |
} |
public void contextDestroyed(ServletContextEvent arg0) { |
ServletContext context = arg0.getServletContext(); |
this.executor.shutdownNow(); |
} |
public class CacheExecutorService |
implements ServletContextListener |
{ |
static final String EXECUTOR_NAME = "CACHE_EXECUTOR"; |
private ExecutorService executor; |
public void contextInitialized(ServletContextEvent arg0) |
{ |
ServletContext context = arg0.getServletContext(); |
int nr_executors = 5; |
ThreadFactory daemonFactory = new DaemonThreadFactory(); |
try { |
nr_executors = Integer.parseInt(context.getInitParameter("cache:thread-count")); |
} catch (NumberFormatException localNumberFormatException) { |
} |
if (nr_executors <= 1) |
this.executor = Executors.newSingleThreadExecutor(daemonFactory); |
else { |
this.executor = Executors.newFixedThreadPool(nr_executors, daemonFactory); |
} |
context.setAttribute("CACHE_EXECUTOR", this.executor); |
} |
public void contextDestroyed(ServletContextEvent arg0) { |
ServletContext context = arg0.getServletContext(); |
this.executor.shutdownNow(); |
} |
} |
/xservices/trunk/src/java/net/brutex/xservices/util/cache/CacheServlet.java |
---|
21,11 → 21,11 |
import java.util.Enumeration; |
import java.util.List; |
import java.util.concurrent.ExecutorService; |
import javax.servlet.ServletContext; |
import javax.servlet.ServletException; |
import javax.servlet.http.HttpServlet; |
import net.brutex.xservices.types.scm.ObjectFactory; |
import org.apache.logging.log4j.LogManager; |
import org.apache.logging.log4j.Logger; |
import org.apache.log4j.Logger; |
/** |
* @author Brian Rosenberger, bru(at)brutex.de |
35,8 → 35,8 |
public class CacheServlet extends HttpServlet |
{ |
private static final Logger logger = LogManager.getLogger(); |
List<File> configfiles = new ArrayList<File>(); |
private final Logger logger = Logger.getLogger(CacheServlet.class); |
List<File> configfiles = new ArrayList(); |
int cacheinterval; |
private final ObjectFactory FACTORY = new ObjectFactory(); |
/xservices/trunk/src/java/net/brutex/xservices/util/cache/FindingsConfigBean.java |
---|
19,7 → 19,8 |
import java.io.File; |
import java.util.List; |
import org.apache.logging.log4j.Logger; |
import org.apache.commons.configuration.PropertiesConfiguration; |
import org.apache.log4j.Logger; |
/** |
* @author Brian Rosenberger, bru(at)brutex.de |
26,10 → 27,11 |
* |
*/ |
public class FindingsConfigBean { |
private Logger logger; |
private final Logger logger; |
private final int instanceid; |
private File cvsconfig; |
private int cacheinterval = 15; |
private List<Object> filepatterns; |
38,8 → 40,8 |
public FindingsConfigBean(int instanceid, Logger logger) { |
this.instanceid = instanceid; |
this.logger = logger; |
logger.debug("Initialise FindingsConfigBean instance '" + instanceid + "'"); |
logger.debug("Initialise FindingsConfigBean instance '"+instanceid+"'"); |
} |
/** |
50,13 → 52,12 |
} |
/** |
* @param cacheinterval |
* the cache interval to set |
* @param cacheinterval the cache interval to set |
*/ |
public void setCacheinterval(int cacheinterval) { |
this.cacheinterval = cacheinterval; |
} |
/** |
* @return the cvsconfig |
*/ |
65,8 → 66,7 |
} |
/** |
* @param cvsconfig |
* the cvsconfig to set |
* @param cvsconfig the cvsconfig to set |
*/ |
public void setCvsconfig(File cvsconfig) { |
this.cvsconfig = cvsconfig; |
80,8 → 80,7 |
} |
/** |
* @param filepatterns |
* the filepatterns to set |
* @param filepatterns the filepatterns to set |
*/ |
public void setFilepatterns(List<Object> filepatterns) { |
this.filepatterns = filepatterns; |
95,8 → 94,7 |
} |
/** |
* @param contentpatterns |
* the contentpatterns to set |
* @param contentpatterns the contentpatterns to set |
*/ |
public void setContentpatterns(List<Object> contentpatterns) { |
this.contentpatterns = contentpatterns; |
105,5 → 103,5 |
/** |
* @param instanceid |
*/ |
} |