From 90fe19eb8d382915bfce911828e92c86f8dfad2c Mon Sep 17 00:00:00 2001 From: rbygrave Date: Wed, 17 Dec 2014 21:04:21 +1300 Subject: [PATCH] cleanup of ebean.properties --- src/test/resources/ebean.properties | 49 +++++------------------------ 1 file changed, 7 insertions(+), 42 deletions(-) diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties index 0dab82dec..daa5877f2 100644 --- a/src/test/resources/ebean.properties +++ b/src/test/resources/ebean.properties @@ -11,9 +11,6 @@ ebean.encryptKeyManager=com.avaje.tests.basic.encrypt.BasicEncyptKeyManager -#ebean.vanillaMode=true -#ebean.allowSubclassing=false - ebean.autofetch.querytuning=false ebean.autofetch.profiling=false ebean.autofetch.implicitmode=default_off @@ -30,8 +27,6 @@ ebean.ddl.run=true ebean.persistBatch=NONE ebean.persistBatchOnCascade=ALL -ebean.debug.sql=true -#ebean.debug.lazyload=false #ebean.cluster.type=mcast #ebean.cluster.mcast.listen.port=9768 @@ -42,30 +37,11 @@ ebean.debug.sql=true #ebean.cluster.debuglevel=1 - ebean.uuidStoreAsBinary=true ebean.cacheWarmingDelay=-1 ##ebean.transaction.rollbackOnChecked=false -## ------------------------------------------------------------- -## Data Types -## ------------------------------------------------------------- - -#ebean.pg.databaseBooleanTrue=1 -#ebean.pg.databaseBooleanFalse=0 - -## ------------------------------------------------------------- -## Batch Mode -## ------------------------------------------------------------- - -#ebean.batch.mode=true -#ebean.batch.size=20 - -#ebean.namingConvention=com.avaje.ebean.config.UnderscoreNamingConvention -#ebean.namingConvention.sequenceFormat={table}_{column}_seq -#ebean.namingConvention.schema=banan -#ebean.databaseSequenceBatchSize=1 ## ------------------------------------------------------------- ## DataSources (If using default Ebean DataSourceFactory) @@ -80,12 +56,11 @@ datasource.h2.databaseDriver=org.h2.Driver datasource.h2.minConnections=1 datasource.h2.maxConnections=25 #datasource.h2.heartbeatsql=select 1 -datasource.h2.isolationlevel=read_committed -datasource.h2.capturestacktrace=true -datasource.h2.maxStackTraceSize=20 +#datasource.h2.isolationlevel=read_committed +#datasource.h2.capturestacktrace=true +#datasource.h2.maxStackTraceSize=20 datasource.h2.poolListener=com.avaje.tests.basic.MyTestDataSourcePoolListener - -datasource.h2.customProperties=IGNORECASE=TRUE;MODE=Oracle; +#datasource.h2.customProperties=IGNORECASE=TRUE;MODE=Oracle; datasource.h2autocommit.autoCommit=true datasource.h2autocommit.username=sa @@ -106,34 +81,24 @@ datasource.hsqldb.username=sa datasource.hsqldb.password= datasource.hsqldb.databaseUrl=jdbc:hsqldb:mem:tests datasource.hsqldb.databaseDriver=org.hsqldb.jdbcDriver -datasource.hsqldb.minConnections=1 -datasource.hsqldb.maxConnections=25 + datasource.mysql.username=test datasource.mysql.password=test datasource.mysql.databaseUrl=jdbc:mysql://127.0.0.1:3306/test datasource.mysql.databaseDriver=com.mysql.jdbc.Driver -datasource.mysql.minConnections=2 -datasource.mysql.maxConnections=25 -#datasource.mysql.heartbeatsql=select count(*) from dual -datasource.mysql.isolationlevel=read_committed + datasource.ora.username=junk datasource.ora.password=junk datasource.ora.databaseUrl=jdbc:oracle:thin:@127.0.0.1:1521:XE datasource.ora.databaseDriver=oracle.jdbc.driver.OracleDriver -datasource.ora.minConnections=1 -datasource.ora.maxConnections=10 -datasource.ora.heartbeatsql=select count(*) from dual -datasource.ora.isolationlevel=read_committed -datasource.ora.capturestacktrace=true -#datasource.ora.customProperties=oracle.net.CONNECT_TIMEOUT=3000;oracle.jdbc.ReadTimeout=10000 + datasource.pg.username=test datasource.pg.password=test datasource.pg.databaseUrl=jdbc:postgresql://127.0.0.1:5433/test datasource.pg.databaseDriver=org.postgresql.Driver -datasource.pg.heartbeatsql=select 1 #datasource.ms.username=sa #datasource.ms.password=changeme