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

9 files changed, 172 insertions, 120 deletions

diff --git a/orkbasej/java/database-example.hbm.xml b/orkbasej/java/database-example.hbm.xml
new file mode 100644
index 0000000..73a5a04
--- /dev/null
+++ b/orkbasej/java/database-example.hbm.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!DOCTYPE hibernate-configuration PUBLIC

+		"-//Hibernate/Hibernate Configuration DTD 3.0//EN"

+		"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">

+<hibernate-configuration>

+    <session-factory>    

+	<property name="hibernate.dialect">org.hibernate.dialect.MySQLInnoDBDialect</property>

+	<property name="hibernate.connection.maxconnections">100</property>

+	<property name="hibernate.connection.driver_class">com.mysql.jdbc.Driver</property>

+	<property name="hibernate.connection.url">jdbc:mysql://localhost/test</property>

+	<property name="hibernate.connection.password">password</property>

+	<property name="hibernate.connection.username">root</property>

+	

+	<property name="hibernate.hbm2ddl.auto">update</property> <!-- update, create, create-drop -->

+	<property name="hibernate.show_sql">false</property>	

+	

+	<property name="hibernate.jdbc.use_scrollable_resultset">true</property>

+	<property name="hibernate.max_fetch_depth">1</property>

+	<property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>

+    </session-factory>

+</hibernate-configuration>
\ No newline at end of file
diff --git a/orkbasej/java/mysql.hbm.template.xml b/orkbasej/java/database.hbm.xml
index 3806981..af84017 100644
--- a/orkbasej/java/mysql.hbm.template.xml
+++ b/orkbasej/java/database.hbm.xml
@@ -1,19 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-configuration PUBLIC
-		"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
-		"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
-<hibernate-configuration>
-    <session-factory>    
-	<property name="hibernate.dialect">org.hibernate.dialect.MySQLInnoDBDialect</property>
-	<property name="hibernate.connection.driver_class">com.mysql.jdbc.Driver</property>
-	<property name="hibernate.connection.url">jdbc:mysql://localhost/test</property>
-	<property name="hibernate.connection.password">password</property>
-	<property name="hibernate.connection.username">root</property>
-	
-	<property name="hibernate.hbm2ddl.auto">update</property> <!-- update, create, create-drop -->
-	<property name="hibernate.show_sql">false</property>	
-	
-	<property name="hibernate.max_fetch_depth">1</property>
-	<property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
-    </session-factory>
-</hibernate-configuration>
+<?xml version="1.0" encoding="UTF-8"?>

+<!DOCTYPE hibernate-configuration PUBLIC

+		"-//Hibernate/Hibernate Configuration DTD 3.0//EN"

+		"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">

+<hibernate-configuration>

+    <session-factory>    

+	<property name="hibernate.dialect">org.hibernate.dialect.MySQLInnoDBDialect</property>

+	<property name="hibernate.connection.maxconnections">100</property>

+	<property name="hibernate.connection.driver_class">com.mysql.jdbc.Driver</property>

+	<property name="hibernate.connection.url">jdbc:mysql://localhost/test</property>

+	<property name="hibernate.connection.password">password</property>

+	<property name="hibernate.connection.username">root</property>

+	

+	<property name="hibernate.hbm2ddl.auto">update</property> <!-- update, create, create-drop -->

+	<property name="hibernate.show_sql">false</property>	

+	

+	<property name="hibernate.jdbc.use_scrollable_resultset">true</property>

+	<property name="hibernate.max_fetch_depth">1</property>

+	<property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>

+    </session-factory>

+</hibernate-configuration>

diff --git a/orkbasej/java/log4j.template.properties b/orkbasej/java/log4j.template.properties
deleted file mode 100644
index af9e970..0000000
--- a/orkbasej/java/log4j.template.properties
+++ /dev/null
@@ -1,40 +0,0 @@
-### stdout ###
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
-
-### logfile ###
-log4j.appender.file=org.apache.log4j.FileAppender
-log4j.appender.file.File=c:\oreka\oreka.log
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
-
-# HUB is a socket hub appender
-#log4j.appender.HUB=org.apache.log4j.net.SocketHubAppender
-#log4j.appender.HUB.layout=org.apache.log4j.PatternLayout
-#log4j.appender.HUB.layout.ConversionPattern=[cc]%d{MMM-dd HH:mm:ss} %-14.14c{1}- %m%n
-#log4j.appender.HUB.port=9000
-
-log4j.rootLogger=info, file, stdout
-
-#################
-### Hibernate logging
-log4j.logger.org.hibernate=info
-#log4j.logger.org.hibernate=debug
-### log just the SQL
-#log4j.logger.org.hibernate.SQL=debug
-### log JDBC bind parameters ###
-log4j.logger.org.hibernate.type=info
-#log4j.logger.org.hibernate.type=debug
-### log schema export/update ###
-log4j.logger.org.hibernate.tool.hbm2ddl=info
-### log HQL parse trees
-#log4j.logger.org.hibernate.hql=debug
-### log cache activity ###
-#log4j.logger.org.hibernate.cache=debug
-### log JDBC resource acquisition
-#log4j.logger.org.hibernate.jdbc=debug
-### enable the following line if you want to track down connection ###
-### leakages when using DriverManagerConnectionProvider ###
-#log4j.logger.org.hibernate.connection.DriverManagerConnectionProvider=trace
diff --git a/orkbasej/java/logging-example.properties b/orkbasej/java/logging-example.properties
new file mode 100644
index 0000000..f0c657e
--- /dev/null
+++ b/orkbasej/java/logging-example.properties
@@ -0,0 +1,36 @@
+### stdout ###
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+#log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %c %5p %C{1}:%L - %m%n
+log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %c %5p - %m%n

+
+### orkweb.log ###
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+log4j.appender.file.File=c:/orkweb.log

+log4j.appender.file.MaxFileSize=7000KB

+log4j.appender.file.MaxBackupIndex=20
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d{ISO8601} %c %5p - %m%n

+

+### orklicense.log ###

+log4j.logger.net.sf.oreka.orkweb.LicenseManager=info, license

+log4j.appender.license=org.apache.log4j.RollingFileAppender

+log4j.appender.license.File=c:/orklicense.log

+log4j.appender.license.MaxFileSize=200KB

+log4j.appender.license.MaxBackupIndex=3

+log4j.appender.license.layout=org.apache.log4j.PatternLayout

+log4j.appender.license.layout.ConversionPattern=%d{ISO8601} %c %5p - %m%n
+

+log4j.rootLogger=info, file, stdout

+log4j.logger.net.sf.oreka=info

+log4j.logger.net.sf.oreka.orktrack=info

+log4j.logger.org.hibernate=error

+log4j.logger.org.hibernate.SQL=off

+log4j.logger.org.apache.tapestry=info

+log4j.logger.tapestry=error

+log4j.logger.org.apache.hivemind=info

+log4j.logger.hivemind=error

+log4j.logger.org.logicalcobwebs.proxool=error

+log4j.logger.org.apache.catalina=error

+log4j.logger.uk.ltd.getahead=warn

diff --git a/orkbasej/java/logging.properties b/orkbasej/java/logging.properties
new file mode 100644
index 0000000..f0c657e
--- /dev/null
+++ b/orkbasej/java/logging.properties
@@ -0,0 +1,36 @@
+### stdout ###
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+#log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %c %5p %C{1}:%L - %m%n
+log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %c %5p - %m%n

+
+### orkweb.log ###
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+log4j.appender.file.File=c:/orkweb.log

+log4j.appender.file.MaxFileSize=7000KB

+log4j.appender.file.MaxBackupIndex=20
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d{ISO8601} %c %5p - %m%n

+

+### orklicense.log ###

+log4j.logger.net.sf.oreka.orkweb.LicenseManager=info, license

+log4j.appender.license=org.apache.log4j.RollingFileAppender

+log4j.appender.license.File=c:/orklicense.log

+log4j.appender.license.MaxFileSize=200KB

+log4j.appender.license.MaxBackupIndex=3

+log4j.appender.license.layout=org.apache.log4j.PatternLayout

+log4j.appender.license.layout.ConversionPattern=%d{ISO8601} %c %5p - %m%n
+

+log4j.rootLogger=info, file, stdout

+log4j.logger.net.sf.oreka=info

+log4j.logger.net.sf.oreka.orktrack=info

+log4j.logger.org.hibernate=error

+log4j.logger.org.hibernate.SQL=off

+log4j.logger.org.apache.tapestry=info

+log4j.logger.tapestry=error

+log4j.logger.org.apache.hivemind=info

+log4j.logger.hivemind=error

+log4j.logger.org.logicalcobwebs.proxool=error

+log4j.logger.org.apache.catalina=error

+log4j.logger.uk.ltd.getahead=warn

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();
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);
 		}