diff options
Diffstat (limited to 'orkweb/src/net/sf/oreka/orkweb/ContextListener.java')
| -rw-r--r-- | orkweb/src/net/sf/oreka/orkweb/ContextListener.java | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/orkweb/src/net/sf/oreka/orkweb/ContextListener.java b/orkweb/src/net/sf/oreka/orkweb/ContextListener.java index ea21194..b5da2a9 100644 --- a/orkweb/src/net/sf/oreka/orkweb/ContextListener.java +++ b/orkweb/src/net/sf/oreka/orkweb/ContextListener.java @@ -17,8 +17,6 @@ import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import net.sf.oreka.HibernateManager; - import org.apache.log4j.Logger; public class ContextListener implements ServletContextListener { @@ -29,22 +27,33 @@ public class ContextListener implements ServletContextListener { public void contextInitialized(ServletContextEvent servletContextEvent) { ServletContext context = servletContextEvent.getServletContext(); - String log4jConfigFile = context.getInitParameter("Log4jConfigFile"); - + + String configFolder = context.getInitParameter("ConfigDirectory"); + if (configFolder == null) { + configFolder = "c:/oreka/"; + } + + String log4jConfigFile = context.getInitParameter("Log4jConfigFile"); if (log4jConfigFile == null) { - System.out.println("Log4jConfigFile context-param missing in web.xml"); + log.error("Log4jConfigFile context-param missing in web.xml"); + } else { + log4jConfigFile = configFolder + "/" + log4jConfigFile; + LogManager.getInstance().configure(log4jConfigFile); + log = LogManager.getInstance().getRootLogger(); + log.info("log4jConfigFile is " + log4jConfigFile); } - - LogManager.getInstance().configure(log4jConfigFile); - log = LogManager.getInstance().getRootLogger(); + log.info("========================================"); log.info("orkweb starting ..."); - + String hibernateConfigFile = context.getInitParameter("HibernateConfigFile"); if (hibernateConfigFile == null) { log.error("HibernateConfigFile context-param missing in web.xml"); - } - + } else { + log.info("HibernateConfigFile is " + hibernateConfigFile); + hibernateConfigFile = configFolder + "/" + hibernateConfigFile ; + } + try { OrkWeb.hibernateManager.configure(hibernateConfigFile); } |