HHH-3621 - Reverting the log4j.properties and hibernate.properties, which insisted in going with the other changes, in the previous commit.

git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@16397 1b8cb986-b30d-0410-93ca-fae66ebed9b2

testsuite/src/test/resources/hibernate.properties

@@ -1,18 +1,31 @@
-## Database specific
+################################################################################
-hibernate.dialect org.hibernate.dialect.Oracle10gDialect
+# Copyright (c) 2007, Red Hat Middleware, LLC. All rights reserved.            #
-hibernate.connection.driver_class oracle.jdbc.driver.OracleDriver
+#                                                                              #
-hibernate.connection.url jdbc:oracle:thin:@dev01.qa.atl.jboss.com:1521:qadb01
+# This copyrighted material is made available to anyone wishing to use, modify,#
-hibernate.connection.username hibernate
+# copy, or redistribute it subject to the terms and conditions of the GNU      #
-hibernate.connection.password hibernate
+# Lesser General Public License, v. 2.1. This program is distributed in the    #
-hibernate.default_schema hibernate
+# hope that it will be useful, but WITHOUT A WARRANTY; without even the implied#
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU #
+# Lesser General Public License for more details. You should have received a   #
+# copy of the GNU Lesser General Public License, v.2.1 along with this         #
+# distribution; if not, write to the Free Software Foundation, Inc.,           #
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.                 #
+#                                                                              #
+# Red Hat Author(s): Steve Ebersole                                            #
+################################################################################
+hibernate.dialect ${db.dialect}
+hibernate.connection.driver_class ${jdbc.driver}
+hibernate.connection.url ${jdbc.url}
+hibernate.connection.username ${jdbc.user}
+hibernate.connection.password ${jdbc.pass}
+hibernate.connection.isolation ${jdbc.isolation}
 
-## Extra options from original hibernate.properties
+hibernate.connection.pool_size 5
-hibernate.jdbc.batch_versioned_data false 
-hibernate.jdbc.use_streams_for_binary true 
 
-## options for cleandb
+hibernate.show_sql true
-driver=oracle.jdbc.driver.OracleDriver
+hibernate.format_sql true
-url=jdbc:oracle:thin:@dev01.qa.atl.jboss.com:1521:qadb01
+
-username=hibernate
+hibernate.max_fetch_depth 5
-password=hibernate
+
-schema=HIBERNATE
+hibernate.cache.region_prefix hibernate.test
+hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider

testsuite/src/test/resources/log4j.properties

@@ -1,54 +1,10 @@
-### direct log messages to 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
 
-### direct messages to file hibernate.log ###
-log4j.appender.file=org.apache.log4j.FileAppender
-log4j.appender.file.File=hibernate.log
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
 
-### direct messages to socket - chainsaw ###
+log4j.rootLogger=info, stdout
-log4j.appender.socket=org.apache.log4j.net.SocketAppender
-log4j.appender.socket.remoteHost=localhost
-log4j.appender.socket.port=4560
-log4j.appender.socket.locationInfo=true
 
-### set log levels - for more verbose logging change 'info' to 'debug' ###
+log4j.logger.org.hibernate.test=info
-
-log4j.rootLogger=warn, stdout
-
-log4j.logger.org.hibernate=debug
-#log4j.logger.org.hibernate=debug
-
-log4j.logger.org.hibernate.ejb=debug
-log4j.logger.org.hibernate.ejb.packaging=debug
-log4j.logger.org.hibernate.reflection=debug
-
-#log4j.logger.org.hibernate.engine.Cascades=debug
-#log4j.logger.org.hibernate.hql=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=debug
-
-### 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