incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1098941 [8/8] - in /incubator/isis/trunk/runtimes/dflt/objectstores: nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/ nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/file/ nosql/src/main/java/org/a...
Date Tue, 03 May 2011 06:52:55 GMT
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=1098941&r1=1098940&r2=1098941&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
Tue May  3 06:52:51 2011
@@ -17,54 +17,55 @@
  *  under the License.
  */
 
+/**
+ * 
+ */
+package org.apache.isis.runtimes.dflt.objectstores.sql;
 
-/**
- * 
- */
-package org.apache.isis.runtimes.dflt.objectstores.sql;
-
 import java.util.Properties;
 
 import org.apache.isis.runtimes.dflt.objectstores.sql.common.SqlIntegrationTestCommon;
-
-
-
-
-public class MySqlTest extends SqlIntegrationTestCommon {
-
-	/**/
-	@Override
-	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&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", "");
-		}
-		return properties;
-	}
-	/**/
-	
-	public  String getPropertiesFilename(){
-		return "mysql.properties";
-	}
 
+public class MySqlTest extends SqlIntegrationTestCommon {
+
+    /**/
+    @Override
+    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&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", "");
+        }
+        return properties;
+    }
+
+    /**/
+
+    @Override
+    public String getPropertiesFilename() {
+        return "mysql.properties";
+    }
+
+    @Override
     public String getPersonTableName() {
         return "isis_sqldataclass";
     }
 
+    @Override
     public String getSimpleClassTableName() {
         return "isis_simpleclass";
     }
 
+    @Override
     public String getSimpleClassTwoTableName() {
         return "isis_simpleclasstwo";
     }
 
-	
-}
-
+}

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=1098941&r1=1098940&r2=1098941&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
Tue May  3 06:52:51 2011
@@ -17,53 +17,52 @@
  *  under the License.
  */
 
+/**
+ * 
+ */
+package org.apache.isis.runtimes.dflt.objectstores.sql;
+
+import java.util.Properties;
 
-/**
- * 
- */
-package org.apache.isis.runtimes.dflt.objectstores.sql;
-
-import java.util.Properties;
-
 import org.apache.isis.runtimes.dflt.objectstores.sql.common.SqlIntegrationTestCommon;
-
-
-
-
-public class PostgreSqlTest extends SqlIntegrationTestCommon {
-	
-	@Override
-	public Properties getProperties(){
-		Properties properties = super.getProperties();
-		if (properties == null){
-			properties = new Properties();
-			// Only used if src/test/config/postgresql.properties does not exist.
-			properties.put(SqlObjectStore.BASE_NAME + ".jdbc.driver", "org.postgresql.Driver");
-			properties.put(SqlObjectStore.BASE_NAME + ".jdbc.connection", "jdbc:postgresql://abacus/noftest");
-			properties.put(SqlObjectStore.BASE_NAME + ".jdbc.user", "nof");
-			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;
-	}
-	
-	public  String getPropertiesFilename(){
-		return "postgresql.properties";
-	}	
-	
+
+public class PostgreSqlTest extends SqlIntegrationTestCommon {
+
+    @Override
+    public Properties getProperties() {
+        Properties properties = super.getProperties();
+        if (properties == null) {
+            properties = new Properties();
+            // Only used if src/test/config/postgresql.properties does not exist.
+            properties.put(SqlObjectStore.BASE_NAME + ".jdbc.driver", "org.postgresql.Driver");
+            properties.put(SqlObjectStore.BASE_NAME + ".jdbc.connection", "jdbc:postgresql://abacus/noftest");
+            properties.put(SqlObjectStore.BASE_NAME + ".jdbc.user", "nof");
+            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;
+    }
+
+    @Override
+    public String getPropertiesFilename() {
+        return "postgresql.properties";
+    }
+
+    @Override
     public String getPersonTableName() {
         return "isis_sqldataclass";
     }
 
+    @Override
     public String getSimpleClassTableName() {
         return "isis_simpleclass";
     }
 
+    @Override
     public String getSimpleClassTwoTableName() {
         return "isis_simpleclasstwo";
     }
-	
-}
-
+
+}



Mime
View raw message