From b6314d4775a0cf2d5e5f86b3cd863dd38b8c560a Mon Sep 17 00:00:00 2001
From: Richard Millet <richard.millet@berkeley.edu>
Date: Mon, 21 Nov 2011 08:07:41 +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.

---
 .../src/main/resources/META-INF/persistence.xml        | 10 +++++-----
 .../resources/applicationContext-authorization.xml     |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/services/JaxRsServiceProvider/src/main/resources/META-INF/persistence.xml b/services/JaxRsServiceProvider/src/main/resources/META-INF/persistence.xml
index c058f6a9b..96e4234de 100644
--- a/services/JaxRsServiceProvider/src/main/resources/META-INF/persistence.xml
+++ b/services/JaxRsServiceProvider/src/main/resources/META-INF/persistence.xml
@@ -17,13 +17,13 @@
         <class>org.collectionspace.services.authorization.Role</class>
         <class>org.collectionspace.services.authorization.AccountRoleRel</class>
         <properties>
-			<property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect"/>
+			<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="com.mysql.jdbc.Driver"/>
-			<property name="hibernate.connection.username" value="root"/>
-			<property name="hibernate.connection.password" value="admin"/>
-			<property name="hibernate.connection.url" value="jdbc:mysql://localhost:3306/cspace"/>
+			<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>
diff --git a/services/authorization/service/src/main/resources/applicationContext-authorization.xml b/services/authorization/service/src/main/resources/applicationContext-authorization.xml
index 625ddefc8..5f8d801d2 100644
--- a/services/authorization/service/src/main/resources/applicationContext-authorization.xml
+++ b/services/authorization/service/src/main/resources/applicationContext-authorization.xml
@@ -42,10 +42,10 @@
      -->
     
 	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="url" value="jdbc:mysql://localhost:3306/cspace"/>
-        <property name="username" value="root"/>
-        <property name="password" value="admin"/>
+        <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="lookupStrategy" class="org.springframework.security.acls.jdbc.BasicLookupStrategy">
-- 
2.47.3