From 4ad195d8cac16317aa278c12c9271e41d76f5524 Mon Sep 17 00:00:00 2001
From: Richard Millet <richard.millet@berkeley.edu>
Date: Wed, 3 Aug 2011 23:25:42 +0000
Subject: [PATCH] NOJIRA: Restoring postgres settings to be the default
 database server -had accidentally checked-in MySQL settings.

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

diff --git a/build.properties b/build.properties
index b75e115ef..bfbf236d1 100644
--- a/build.properties
+++ b/build.properties
@@ -69,28 +69,29 @@ nuxeo.main.config.file=${jboss.bin}/nuxeo.conf
 #database - select one or the other (not both!), and then uncomment the
 # appropriate section below the common settings
 #db=mysql|postgresql
-db=mysql
+db=postgresql
 #For mysql, uncomment this, and comment out postgres section
-db.port=3306
-db.driver.jar=${jboss.lib.cspace}/mysql-connector-java-5.1.7-bin.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=${jboss.lib.cspace}/mysql-connector-java-5.1.7-bin.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=${jboss.lib.cspace}/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=${jboss.lib.cspace}/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'))
+
 
 #database common settings
 db.script.dir=${jboss.server.cspace}/cspace/services/db/${db}
-- 
2.47.3