incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r1086364 - in /incubator/isis/trunk/runtimes/dflt/objectstores/sql/tests-served/src/test: config/ java/org/apache/isis/runtimes/dflt/objectstores/sql/
Date Mon, 28 Mar 2011 19:49:30 GMT
Author: kevin
Date: Mon Mar 28 19:49:29 2011
New Revision: 1086364

URL: http://svn.apache.org/viewvc?rev=1086364&view=rev
Log:
Minor changes to "served" tests, to improve readability.

Modified:
    incubator/isis/trunk/runtimes/dflt/objectstores/sql/tests-served/src/test/config/mysql.properties
    incubator/isis/trunk/runtimes/dflt/objectstores/sql/tests-served/src/test/config/postgresql.properties
    incubator/isis/trunk/runtimes/dflt/objectstores/sql/tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/MySqlTest.java
    incubator/isis/trunk/runtimes/dflt/objectstores/sql/tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/PostgreSqlTest.java

Modified: incubator/isis/trunk/runtimes/dflt/objectstores/sql/tests-served/src/test/config/mysql.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/sql/tests-served/src/test/config/mysql.properties?rev=1086364&r1=1086363&r2=1086364&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/sql/tests-served/src/test/config/mysql.properties
(original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/sql/tests-served/src/test/config/mysql.properties
Mon Mar 28 19:49:29 2011
@@ -1,6 +1,9 @@
 # Sample configuration
 # Edit this file with your server and authentication details.
+#
+# If this file exists, it overrides the MySqlTest#getProperties() method
 isis.persistor.sql.jdbc.driver=com.mysql.jdbc.Driver
-isis.persistor.sql.jdbc.connection=jdbc:mysql://abacus/noftest
+isis.persistor.sql.jdbc.connection=jdbc:mysql://abacus/noftest?useTimezone=false
+#true&serverTimezone=GMT
 isis.persistor.sql.jdbc.user=nof
 isis.persistor.sql.jdbc.password=

Modified: incubator/isis/trunk/runtimes/dflt/objectstores/sql/tests-served/src/test/config/postgresql.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/sql/tests-served/src/test/config/postgresql.properties?rev=1086364&r1=1086363&r2=1086364&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/sql/tests-served/src/test/config/postgresql.properties
(original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/sql/tests-served/src/test/config/postgresql.properties
Mon Mar 28 19:49:29 2011
@@ -1,5 +1,6 @@
 # Sample configuration
 # Edit this file with your server and authentication details.
+# If this file exists, it overrides the PostreSqlTest#getProperties() method
 isis.persistor.sql.jdbc.driver=org.postgresql.Driver
 isis.persistor.sql.jdbc.connection=jdbc:postgresql://abacus/noftest
 isis.persistor.sql.jdbc.user=nof

Modified: incubator/isis/trunk/runtimes/dflt/objectstores/sql/tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/MySqlTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/sql/tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/MySqlTest.java?rev=1086364&r1=1086363&r2=1086364&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/sql/tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/MySqlTest.java
(original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/sql/tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/MySqlTest.java
Mon Mar 28 19:49:29 2011
@@ -37,9 +37,11 @@ public class MySqlTest extends SqlIntegr
 	public Properties getProperties(){
 		Properties properties = super.getProperties();
 		if (properties == null){
+		    // Only used if *sql.properties is not found
 			properties = new Properties();
 			properties.put(SqlObjectStore.BASE_NAME + ".jdbc.driver", "com.mysql.jdbc.Driver");
-			properties.put(SqlObjectStore.BASE_NAME + ".jdbc.connection", "jdbc:mysql://abacus/noftest");
+			//properties.put(SqlObjectStore.BASE_NAME + ".jdbc.connection", "jdbc:mysql://abacus/noftest&useTimezone=true&serverTimezone=GMT");
+			properties.put(SqlObjectStore.BASE_NAME + ".jdbc.connection", "jdbc:mysql://abacus/noftest&useLegacyDatetimeCode=false");
 			properties.put(SqlObjectStore.BASE_NAME + ".jdbc.user", "nof");
 			properties.put(SqlObjectStore.BASE_NAME + ".jdbc.jdbc.password", "");
 		}

Modified: incubator/isis/trunk/runtimes/dflt/objectstores/sql/tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/PostgreSqlTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/objectstores/sql/tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/PostgreSqlTest.java?rev=1086364&r1=1086363&r2=1086364&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/objectstores/sql/tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/PostgreSqlTest.java
(original)
+++ incubator/isis/trunk/runtimes/dflt/objectstores/sql/tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/PostgreSqlTest.java
Mon Mar 28 19:49:29 2011
@@ -44,6 +44,7 @@ public class PostgreSqlTest extends SqlI
 			properties.put(SqlObjectStore.BASE_NAME + ".jdbc.password", "");
 			
             //properties.put(SqlObjectStore.BASE_NAME + ".datatypes.timestamp", "TIMESTAMP");
+            //properties.put(SqlObjectStore.BASE_NAME + ".datatypes.datetime", "TIMESTAMP");
 		}
 		return properties;
 	}



Mime
View raw message