From 16e5bd4e7c07114075024f811628ae65023c64d8 Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 18 Nov 2011 22:34:42 +0000
Subject: [PATCH] CSPACE-4526: Change default servies configuration in Apache
 Tomcat 6/Nuxeo 5.4.x branch to use PostgreSQL, rather than MySQL, per
 Patrick.

---
 build.properties | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/build.properties b/build.properties
index 1adb4ed90..ef18fa1d4 100644
--- a/build.properties
+++ b/build.properties
@@ -80,28 +80,29 @@ db.base.dir=${jee.server.cspace}/cspace/services/db
 #database - select one or the other (not both!), and then uncomment the
 # appropriate section below the common settings
 #db=mysql|postgresql
-db=mysql
+# db=mysql
+db=postgresql
 #For mysql, uncomment this, and comment out postgres section
-db.port=3306
-db.driver.jar=${db.base.dir}/jdbc_drivers/mysql-connector-java-5.1.7.jar
-db.jdbc.driver.class=com.mysql.jdbc.Driver
-db.dialect=org.hibernate.dialect.MySQLDialect
-db.typemapping=mySQL
-db.exceptionsorter=org.jboss.resource.adapter.jdbc.vendor.MySQLExceptionSorter
-db.spring.acl.classIdentityQuery=SELECT @@IDENTITY
-db.spring.acl.sidIdentityQuery=SELECT @@IDENTITY
+# db.port=3306
+# db.driver.jar=${db.base.dir}/jdbc_drivers/mysql-connector-java-5.1.7.jar
+# db.jdbc.driver.class=com.mysql.jdbc.Driver
+# db.dialect=org.hibernate.dialect.MySQLDialect
+# db.typemapping=mySQL
+# db.exceptionsorter=org.jboss.resource.adapter.jdbc.vendor.MySQLExceptionSorter
+# db.spring.acl.classIdentityQuery=SELECT @@IDENTITY
+# db.spring.acl.sidIdentityQuery=SELECT @@IDENTITY
 
 #For postgresql, uncomment this, and comment out mysql section
-#db.port=5432
-#db.driver.jar=${db.base.dir}/jdbc_drivers/postgresql-8.4-702.jdbc4.jar
-#db.jdbc.driver.class=org.postgresql.Driver
-#db.dialect=org.hibernate.dialect.PostgreSQLDialect
-#db.typemapping=PostgreSQL 8.0
+db.port=5432
+db.driver.jar=${db.base.dir}/jdbc_drivers/postgresql-8.4-702.jdbc4.jar
+db.jdbc.driver.class=org.postgresql.Driver
+db.dialect=org.hibernate.dialect.PostgreSQLDialect
+db.typemapping=PostgreSQL 8.0
 # Should be org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter
 # but current JBoss does not seem to include it...
-#db.exceptionsorter= 
-#db.spring.acl.classIdentityQuery=select currval(pg_get_serial_sequence('acl_class', 'id'))
-#db.spring.acl.sidIdentityQuery=select currval(pg_get_serial_sequence('acl_sid', 'id'))
+db.exceptionsorter= 
+db.spring.acl.classIdentityQuery=select currval(pg_get_serial_sequence('acl_class', 'id'))
+db.spring.acl.sidIdentityQuery=select currval(pg_get_serial_sequence('acl_sid', 'id'))
 
 #Hibernate properties for Ant and Maven plugins
 hibernate.dialect=${db.dialect}
-- 
2.47.3