NOJIRA: Restoring postgres settings to be the default database server -had accidental...

diff --git a/build.properties b/build.properties
index b75e115ef6ac6d9704d6df6d103521c9f590e58e..bfbf236d196416a0b37b376f2482c0405101e8f5 100644 (file)
--- 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\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.4-702.jdbc4.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.4-702.jdbc4.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
 db.script.dir=${jboss.server.cspace}/cspace/services/db/${db}\r