diff --git a/gemma-core/src/main/resources/default.properties b/gemma-core/src/main/resources/default.properties index 91a554b390..30c09c19e6 100755 --- a/gemma-core/src/main/resources/default.properties +++ b/gemma-core/src/main/resources/default.properties @@ -43,6 +43,8 @@ gemma.db.maxpoolidle=5 gemma.db.maxtotal=75 # This ensure some basic behaviors of our database gemma.db.sqlMode=STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION +# Default timezone for storage of DATETIME that are mapped to exact moments (i.e. java.util.Date) +gemma.db.timezone=America/Vancouver ############################################################ # SECURITY # Used to elevate authorities for some methods. diff --git a/gemma-core/src/main/resources/ubic/gemma/dataSource.xml b/gemma-core/src/main/resources/ubic/gemma/dataSource.xml index fb529f7658..fdc1269653 100644 --- a/gemma-core/src/main/resources/ubic/gemma/dataSource.xml +++ b/gemma-core/src/main/resources/ubic/gemma/dataSource.xml @@ -15,7 +15,7 @@ - +