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, 27 insertions, 43 deletions

diff --git a/orktrack/context/WEB-INF/web.xml b/orktrack/context/WEB-INF/web.xml
index e7515f7..3f67e7d 100644
--- a/orktrack/context/WEB-INF/web.xml
+++ b/orktrack/context/WEB-INF/web.xml
@@ -5,16 +5,20 @@
 <web-app>
     <display-name>orktrack</display-name>
     <context-param>
+    	<param-name>ConfigDirectory</param-name>
+    	<param-value>c:/oreka/</param-value>
+    </context-param>
+    <context-param>
     	<param-name>Log4jConfigFile</param-name>
-    	<param-value>c:/oreka/orktrack/log4j.properties</param-value>
+    	<param-value>logging.properties</param-value>
     </context-param>
     <context-param>
     	<param-name>ConfigFile</param-name>
-    	<param-value>c:/oreka/orktrack/orktrack.config.xml</param-value>
+    	<param-value>orktrack.config.xml</param-value>
     </context-param>
     <context-param>
     	<param-name>HibernateConfigFile</param-name>
-    	<param-value>c:/oreka/orktrack/mysql.hbm.xml</param-value>
+    	<param-value>database.hbm.xml</param-value>
     </context-param>
     <filter>
         <filter-name>redirect</filter-name>
diff --git a/orktrack/src/net/sf/oreka/orktrack/ContextListener.java b/orktrack/src/net/sf/oreka/orktrack/ContextListener.java
index b8bf558..ebc4b20 100644
--- a/orktrack/src/net/sf/oreka/orktrack/ContextListener.java
+++ b/orktrack/src/net/sf/oreka/orktrack/ContextListener.java
@@ -31,54 +31,34 @@ public class ContextListener implements ServletContextListener {
 	public void contextInitialized(ServletContextEvent servletContextEvent) {
 		
 		ServletContext context = servletContextEvent.getServletContext();
-		String log4jConfigFile = context.getInitParameter("Log4jConfigFile");
 		
-//		boolean complainAboutLog4jConfigFile = false;
-//		if (log4jConfigFile != null) {
-//			LogManager.getInstance().configure(log4jConfigFile);
-//		}
-//		else {
-//			complainAboutLog4jConfigFile = true;
-//		}
+		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 {
+			log.info("log4jConfigFile is " + log4jConfigFile);
+			log4jConfigFile = configFolder + "/" + log4jConfigFile; 
 		}
-		
-//		log.info("========================================");
-//		log.info(OrkTrack.APP_NAME + " starting ...");
-		
-//		if(complainAboutLog4jConfigFile) {
-//			log.warn("contextInitialized: Log4jConfigFile context-param missing in web.xml");
-//		}
-		
-		// Register all OrkObjects
-//		OrkObjectFactory.instance().registerOrkObject(new OrkTrackConfig());	
-		
+
 		String configFile = context.getInitParameter("ConfigFile");
-//		if (configFile != null) {
-//			ConfigManager.getInstance().load(configFile);
-//		}
-//		else {
-//			log.error("contextInitialized: ConfigFile context-param missing in web.xml");			
-//		}
 		if (configFile == null) {
-			System.out.println("ConfigFile context-param missing in web.xml");
+			log.error("ConfigFile context-param missing in web.xml");
+		} else {
+			log.info("configFile is " + configFile);
+			configFile = configFolder + "/" + configFile; 
 		}
-		
+
 		String hibernateConfigFile = context.getInitParameter("HibernateConfigFile");
-//		if (hibernateConfigFile != null) {
-//			try {
-//				HibernateManager.configure(hibernateConfigFile);
-//			}
-//			catch (Exception e) {
-//				log.error("contextInitialized: Error configuring Hibernate:" + e.getMessage());				
-//			}
-//		}
-//		else {
-//			log.error("contextInitialized: HibernateConfigFile context-param missing in web.xml");			
-//		}
 		if (hibernateConfigFile == null) {
-			System.out.println("HibernateConfigFile context-param missing in web.xml");
+			log.error("HibernateConfigFile context-param missing in web.xml");
+		} else {
+			log.info("HibernateConfigFile is " + hibernateConfigFile);
+			hibernateConfigFile  = configFolder + "/" + hibernateConfigFile ; 
 		}
 		
 		//PortManager.instance().initialize();