Return-Path: X-Original-To: apmail-incubator-isis-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-isis-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6C2BF22DA for ; Tue, 3 May 2011 06:53:45 +0000 (UTC) Received: (qmail 49298 invoked by uid 500); 3 May 2011 06:53:45 -0000 Delivered-To: apmail-incubator-isis-commits-archive@incubator.apache.org Received: (qmail 49261 invoked by uid 500); 3 May 2011 06:53:45 -0000 Mailing-List: contact isis-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: isis-dev@incubator.apache.org Delivered-To: mailing list isis-commits@incubator.apache.org Received: (qmail 49246 invoked by uid 99); 3 May 2011 06:53:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 May 2011 06:53:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 May 2011 06:53:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9BA312388C02; Tue, 3 May 2011 06:52:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: isis-commits@incubator.apache.org From: danhaywood@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110503065257.9BA312388C02@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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"; } - -} - + +}