CSPACE-4526: Change default servies configuration in Apache Tomcat 6/Nuxeo 5.4.x...

diff --git a/build.properties b/build.properties
index 1adb4ed90ec3179e632ec1e84213ff488504fd2f..ef18fa1d41ac453cb69e3c69b154a806a4db3637 100644 (file)
--- 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\r
 # appropriate section below the common settings\r
 #db=mysql|postgresql\r
-db=mysql\r
+# db=mysql\r
+db=postgresql\r
 #For mysql, uncomment this, and comment out postgres section\r
-db.port=3306\r
-db.driver.jar=${db.base.dir}/jdbc_drivers/mysql-connector-java-5.1.7.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=${db.base.dir}/jdbc_drivers/mysql-connector-java-5.1.7.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=${db.base.dir}/jdbc_drivers/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=${db.base.dir}/jdbc_drivers/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
 #Hibernate properties for Ant and Maven plugins\r
 hibernate.dialect=${db.dialect}\r