test cases

SVN-Revision: 23880
khots · Jan 12, 2010 · 4bf7599 · 4bf7599
1 parent 44bbe8c
commit 4bf7599
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 9 deletions.
diff --git a/Struts_testcases_build.xml b/Struts_testcases_build.xml
@@ -59,8 +59,7 @@
 			</fileset>
 
 			<fileset dir="${lib.dir}">
-				<include name="mysql-connector-java-5.0.8-bin.jar" />
-				<include name="ojdbc14.jar" />
+				<include name="**/*.jar"/>
 			</fileset>
 		<pathelement path="${catissue.temp.dir}/WEB-INF"/>
 		</path>

diff --git a/deploy.xml b/deploy.xml
@@ -355,7 +355,7 @@
 
 	<!--Modify Configuration For MySQL-->
 	<target name="mysql_config" description="Modify Configuration For MySQL">
-		<echo message="Modifying caTISSUECore MySQL specific Configuration File..." />
+		<echo message="Modifying caTissue Suite MySQL specific Configuration File..." />
 
 		<replace dir="${temp.dir}/catissuecore-properties" propertyfile="caTissueInstall.properties">
 			<include name="upt.hibernate.cfg.xml" />
@@ -402,7 +402,7 @@
 
 	<!--Modify Configuration For Oracle-->
 	<target name="oracle_config" description="Modify Configuration For Oracle">
-		<echo message="Modifying caTISSUECore Oracle specific Configuration File..." />
+		<echo message="Modifying caTissue Suite Oracle specific Configuration File..." />
 		<replace dir="${temp.dir}/catissuecore-properties" propertyfile="caTissueInstall.properties">
 			<include name="upt.hibernate.cfg.xml" />
 			<include name="catissuecore.hibernate.cfg.xml" />
@@ -610,7 +610,7 @@
 	</target>
 
 	<target name="copy_files" description="copy Configuration Files to JBOSS Directory">
-		<echo message="Copying caTISSUECore Application Components..." />
+		<echo message="Copying caTissue Suite Application Components..." />
 		<replace file="${temp.dir}/catissuecore-properties/caTissueCore_Properties.xml">
 			<replacefilter token="@@ADMIN-EMAILADDRESS@@" value="${email.administrative.emailAddress}" />
 			<replacefilter token="@@SENDEMAILFROM-EMAILADDRESS@@" value="${email.sendEmailFrom.emailAddress}" />
@@ -2633,7 +2633,7 @@ Thanking You,
 					Encoded Password ${first.admin.encodedPassword}
 			</echo>
 
-		<echo message="Modifying caTISSUECore SQL file for user information..."/>
+		<echo message="Modifying caTissue Suite SQL file for user information..."/>
 			<copy file="${oracle.sql.dir}/createUser.sql" todir="${temp.dir}" overwrite="true"/>
 
 			<replace dir="${temp.dir}" propertyfile="caTissueInstall.properties">
@@ -2673,7 +2673,7 @@ Thanking You,
 					Encoded Password ${first.admin.encodedPassword}
 			</echo>
 
-		<echo message="Modifying caTISSUECore SQL file for user information..."/>
+		<echo message="Modifying caTissue Suite SQL file for user information..."/>
 		<copy file="${mysql.sql.dir}/createUser.sql" todir="${temp.dir}" overwrite="true"/>
 
 			<replace dir="${temp.dir}" propertyfile="caTissueInstall.properties">
@@ -3505,7 +3505,7 @@ Thanking You,
 			Encoded Password ${first.admin.encodedPassword}
 		</echo>
 
-		<echo message="Modifying caTISSUECore SQL file for user information..."/>
+		<echo message="Modifying caTissue Suite SQL file for user information..."/>
 		<copy file="${mssqlserver.sql.dir}/createUser.sql" todir="${temp.dir}" overwrite="true"/>
 
 		<replace dir="${temp.dir}" propertyfile="caTissueInstall.properties">
@@ -3532,7 +3532,7 @@ Thanking You,
 
 	<!--Modify Configuration For MsSqlServer-->
 	<target name="mssqlserver_config" description="Modify Configuration For MsSqlServer">
-			<echo message="Modifying caTISSUECore MsSqlServer specific Configuration File..." />
+			<echo message="Modifying caTissue Suite MsSqlServer specific Configuration File..." />
 			<replace dir="${temp.dir}/catissuecore-properties" propertyfile="caTissueInstall.properties">
 				<include name="upt.hibernate.cfg.xml" />
 				<include name="catissuecore.hibernate.cfg.xml" />

diff --git a/log4j.properties b/log4j.properties
@@ -0,0 +1,40 @@
+# Set root category priority to INFO and its only appender to CONSOLE.
+#log4j.rootCategory=INFO, CONSOLE
+log4j.rootCategory=INFO, CONSOLE, LOGFILE
+#log4j.rootCategory=INFO, CONSOLE, LOGFILE
+
+# Set the enterprise logger category to FATAL and its only appender to CONSOLE.
+#log4j.logger.org.apache.axis.enterprise=FATAL, CONSOLE
+
+# CONSOLE is set to be a ConsoleAppender using a PatternLayout.
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.Threshold=INFO
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%5p %d{HH:mm:ss,SSS} (%C{1}) - %m%n
+
+# LOGFILE is set to be a File appender using a PatternLayout.
+log4j.appender.LOGFILE=org.apache.log4j.RollingFileAppender
+log4j.appender.LOGFILE.File=./log/catissue.log
+log4j.appender.LOGFILE.Append=true
+log4j.appender.LOGFILE.MaxFileSize=1024KB
+log4j.appender.LOGFILE.MaxBackupIndex=7
+log4j.appender.LOGFILE.Threshold=INFO
+log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
+#log4j.appender.LOGFILE.layout.ConversionPattern=%-4r %d [%t] %-5p %C{3} - %m%n
+log4j.appender.LOGFILE.layout.ConversionPattern= %-5p %d %C{3} - %m%n
+# LOGFILE for all hibernate logs
+log4j.appender.HIBERNATE=org.apache.log4j.RollingFileAppender
+log4j.appender.HIBERNATE.File=./log/hibernatesql.log
+log4j.appender.HIBERNATE.Append=true
+log4j.appender.HIBERNATE.MaxFileSize=1024KB
+log4j.appender.HIBERNATE.MaxBackupIndex=7
+log4j.appender.HIBERNATE.Threshold=INFO
+log4j.appender.HIBERNATE.layout=org.apache.log4j.PatternLayout
+log4j.appender.HIBERNATE.layout.ConversionPattern= %-5p %d %c - %m%n
+
+log4j.logger.edu.wustl.catissuecore=info, LOGFILE
+
+#For logging hibernate api messages uncomment either of the following
+### log just the SQL
+# log4j.logger.org.hibernate.SQL=debug,HIBERNATE
+#log4j.logger.org.hibernate=info,HIBERNATE