From e827f9c7ab5d50e1e2537d7f620f7c928779b8ce Mon Sep 17 00:00:00 2001
From: Richard Millet <richard.millet@berkeley.edu>
Date: Mon, 21 Nov 2011 19:15:53 +0000
Subject: [PATCH] CSPACE-4526: Adding more support for PostgreSQL to be the
 default DB.  These changes will be reverted once the Nuxeo JNDI fix is in
 place.

---
 .../main/resources/META-INF/persistence.xml   | 19 ++++++++++++++++++-
 .../applicationContext-authorization.xml      |  9 +++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/services/JaxRsServiceProvider/src/main/resources/META-INF/persistence.xml b/services/JaxRsServiceProvider/src/main/resources/META-INF/persistence.xml
index 96e4234de..d454ed04b 100644
--- a/services/JaxRsServiceProvider/src/main/resources/META-INF/persistence.xml
+++ b/services/JaxRsServiceProvider/src/main/resources/META-INF/persistence.xml
@@ -16,15 +16,32 @@
         <class>org.collectionspace.services.authorization.PermissionRoleRel</class>
         <class>org.collectionspace.services.authorization.Role</class>
         <class>org.collectionspace.services.authorization.AccountRoleRel</class>
+        
+        <!-- 
         <properties>
 			<property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>
             <property name="hibernate.max_fetch_depth" value="3"/>
+        --> 
 			<!-- Until our JNDI issue with Nuxeo is resolved, we have to use these JDBC properties rather than a datasource -->
+		<!-- 	
 			<property name="hibernate.connection.driver_class" value="org.postgresql.Driver"/>
 			<property name="hibernate.connection.username" value="postgres"/>
 			<property name="hibernate.connection.password" value="pgSEE^quell"/>
 			<property name="hibernate.connection.url" value="jdbc:postgresql://localhost:5432/cspace"/>
-			
+		-->
+            <!--property name="hibernate.hbm2ddl.auto" value="create-drop"/-->
+        <!--
+        </properties>
+         -->
+
+        <properties>
+			<property name="hibernate.dialect" value="${db.dialect}"/>
+            <property name="hibernate.max_fetch_depth" value="3"/>
+			<!-- Until our JNDI issue with Nuxeo is resolved, we have to use these JDBC properties rather than a datasource -->
+			<property name="hibernate.connection.driver_class" value="${db.jdbc.driver.class}"/>
+			<property name="hibernate.connection.username" value="${db.user}"/>
+			<property name="hibernate.connection.password" value="${db.user.password}"/>
+			<property name="hibernate.connection.url" value="jdbc:${db}://localhost:${db.port}/cspace"/>
             <!--property name="hibernate.hbm2ddl.auto" value="create-drop"/-->
         </properties>
 
diff --git a/services/authorization/service/src/main/resources/applicationContext-authorization.xml b/services/authorization/service/src/main/resources/applicationContext-authorization.xml
index 5f8d801d2..dac9c386e 100644
--- a/services/authorization/service/src/main/resources/applicationContext-authorization.xml
+++ b/services/authorization/service/src/main/resources/applicationContext-authorization.xml
@@ -41,11 +41,20 @@
     </bean>
      -->
     
+    <!-- 
 	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
         <property name="driverClassName" value="org.postgresql.Driver"/>
         <property name="url" value="jdbc:postgresql://localhost:5432/cspace"/>
         <property name="username" value="postgres"/>
         <property name="password" value="pgSEE^quell"/>
+    </bean>
+     -->
+
+	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+        <property name="driverClassName" value="${db.jdbc.driver.class}"/>
+        <property name="url" value="jdbc:${db}://localhost:${db.port}/cspace"/>
+        <property name="username" value="${db.user}"/>
+        <property name="password" value="${db.user.password}"/>
     </bean>    
 
     <bean id="lookupStrategy" class="org.springframework.security.acls.jdbc.BasicLookupStrategy">
-- 
2.47.3