CSPACE-2903, CSPACE-2421. Committing the postgresql variant as the default.

diff --git a/build.properties b/build.properties
index dd351fab518737c8507eb8925d7839e04bd5b406..0fde3f62a8906dcc0bde12d0a825db1545f38aea 100644 (file)
--- a/build.properties
+++ b/build.properties
@@ -68,28 +68,28 @@ nuxeo.main.config.file=${jboss.bin}/nuxeo.conf
 #database - select one or the other (not both!), and then uncomment the\r
 # appropriate section below the common settings\r
 #db=mysql|postgresql\r
-db=mysql\r
+db=postgresql\r
 #For mysql, uncomment this, and comment out postgres section\r
-db.port=3306\r
-db.driver.jar=${jboss.lib.cspace}/mysql-connector-java-5.1.7-bin.jar\r
-db.jdbc.driver.class=com.mysql.jdbc.Driver\r
-db.dialect=org.hibernate.dialect.MySQLDialect\r
-db.typemapping=mySQL\r
-db.exceptionsorter=org.jboss.resource.adapter.jdbc.vendor.MySQLExceptionSorter\r
-db.spring.acl.classIdentityQuery=SELECT @@IDENTITY\r
-db.spring.acl.sidIdentityQuery=SELECT @@IDENTITY\r
+#db.port=3306\r
+#db.driver.jar=${jboss.lib.cspace}/mysql-connector-java-5.1.7-bin.jar\r
+#db.jdbc.driver.class=com.mysql.jdbc.Driver\r
+#db.dialect=org.hibernate.dialect.MySQLDialect\r
+#db.typemapping=mySQL\r
+#db.exceptionsorter=org.jboss.resource.adapter.jdbc.vendor.MySQLExceptionSorter\r
+#db.spring.acl.classIdentityQuery=SELECT @@IDENTITY\r
+#db.spring.acl.sidIdentityQuery=SELECT @@IDENTITY\r
 \r
 #For postgresql, uncomment this, and comment out mysql section\r
-#db.port=5432\r
-#db.driver.jar=${jboss.lib.cspace}/postgresql-8.3-604.jdbc3.jar\r
-#db.jdbc.driver.class=org.postgresql.Driver\r
-#db.dialect=org.hibernate.dialect.PostgreSQLDialect\r
-#db.typemapping=PostgreSQL 8.0\r
+db.port=5432\r
+db.driver.jar=${jboss.lib.cspace}/postgresql-8.3-604.jdbc3.jar\r
+db.jdbc.driver.class=org.postgresql.Driver\r
+db.dialect=org.hibernate.dialect.PostgreSQLDialect\r
+db.typemapping=PostgreSQL 8.0\r
 # Should be org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter\r
 # but current JBoss does not seem to include it...\r
-#db.exceptionsorter= \r
-#db.spring.acl.classIdentityQuery=select currval(pg_get_serial_sequence('acl_class', 'id'))\r
-#db.spring.acl.sidIdentityQuery=select currval(pg_get_serial_sequence('acl_sid', 'id'))\r
+db.exceptionsorter= \r
+db.spring.acl.classIdentityQuery=select currval(pg_get_serial_sequence('acl_class', 'id'))\r
+db.spring.acl.sidIdentityQuery=select currval(pg_get_serial_sequence('acl_sid', 'id'))\r
 \r
 \r
 #database common settings\r