Combined hibernate and logging configuration files for orkweb and orktrack.

Please refer to new documentation regarding manual deployment of orkweb and orktrack.

git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@571 09dcff7a-b715-0410-9601-b79a96267cd0

2 files changed, 31 insertions, 18 deletions

diff --git a/orkweb/context/WEB-INF/web.xml b/orkweb/context/WEB-INF/web.xml
index d460500..e0b025d 100644
--- a/orkweb/context/WEB-INF/web.xml
+++ b/orkweb/context/WEB-INF/web.xml
@@ -7,14 +7,18 @@
 
 <web-app>
     <display-name>orkweb</display-name>
-    <context-param>
-    	<param-name>Log4jConfigFile</param-name>
-    	<param-value>c:/oreka/orkweb/log4j.properties</param-value>
-    </context-param>
-    <context-param>
-    	<param-name>HibernateConfigFile</param-name>
-    	<param-value>c:/oreka/orkweb/mysql.hbm.xml</param-value>
+   	<context-param>
+		  <param-name>ConfigDirectory</param-name>
+		  <param-value>c:/oreka/</param-value>
+	  </context-param>
+	  <context-param>
+		  <param-name>Log4jConfigFile</param-name>
+		  <param-value>logging.properties</param-value>
     </context-param>
+	  <context-param>
+		  <param-name>HibernateConfigFile</param-name>
+		  <param-value>database.hbm.xml</param-value>
+    </context-param>  
     <context-param>
     	<param-name>Debug</param-name>
     	<param-value>false</param-value>
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);
 		}