From e6405c99fbb3f960924ef4fc143958fa38fa0892 Mon Sep 17 00:00:00 2001
From: mochaholic <jafarim@gmail.com>
Date: Wed, 18 Feb 2015 17:00:40 -0700
Subject: [PATCH] Added (commented-out) mysql configs to
 hapi-fhir-server-database-config.xml and the corresponding class to
 facilitate mysql-based deployment.

---
 .../java/ca/uhn/fhirtest/MySqlServer.java     | 20 +++++++++++++
 .../hapi-fhir-server-database-config.xml      | 28 ++++++++++++++++---
 2 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/MySqlServer.java

diff --git a/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/MySqlServer.java b/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/MySqlServer.java
new file mode 100644
index 00000000000..31610b254cd
--- /dev/null
+++ b/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/MySqlServer.java
@@ -0,0 +1,20 @@
+package ca.uhn.fhirtest;
+
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.InitializingBean;
+
+/**
+ * Created by mochaholic on 18/02/2015.
+ */
+public class MySqlServer implements InitializingBean, DisposableBean {
+    private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(MySqlServer.class);
+
+    @Override
+    public void destroy() throws Exception {
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+    }
+
+}
\ No newline at end of file
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/hapi-fhir-server-database-config.xml b/hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/hapi-fhir-server-database-config.xml
index 32b386941d4..80719eaa17a 100644
--- a/hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/hapi-fhir-server-database-config.xml
+++ b/hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/hapi-fhir-server-database-config.xml
@@ -1,7 +1,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xmlns:security="http://www.springframework.org/schema/security"
-	xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
-	xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
+	   xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context"
+	   xmlns:security="http://www.springframework.org/schema/security"
+	   xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
+	   xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
 		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
 		http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
@@ -25,6 +26,12 @@
 	<bean id="dbServer" class="ca.uhn.fhirtest.DerbyNetworkServer">
 	</bean>
 
+	<!--for mysql-->
+	<!--
+	<bean id="dbServer" class="ca.uhn.fhirtest.MySqlServer">
+	</bean>
+	-->
+
 	<bean  depends-on="dbServer" id="myPersistenceDataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
 		<!-- ;create=true /opt/glassfish/glassfish4/glassfish/nodes/localhost-domain1/fhirtest/fhirdb -->
 		<!-- <property name="url" value="jdbc:hsqldb:hsql://localhost/uhnfhirdb"/>-->
@@ -36,7 +43,19 @@
 		<property name="username" value="SA"/>
 		<property name="password" value="SA"/>
 	</bean>
-	
+
+	<!--for mysql-->
+	<!--
+		<bean  depends-on="dbServer" id="myPersistenceDataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
+		<property name="driverClassName" value="com.mysql.jdbc.Driver"></property>
+		<property name="url" value="jdbc:mysql://fhirdb.url/fhirdbname" />
+		<property name="username" value="sa"/>
+		<property name="password" value="sa"/>
+		<property name="testOnBorrow" value="true"/>
+		<property name="validationQuery" value="select 1;"/>
+	</bean>
+	-->
+
 	<bean  depends-on="dbServer" id="myEntityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
 		<property name="dataSource" ref="myPersistenceDataSource" />
 		<property name="persistenceXmlLocation" value="classpath:META-INF/fhirtest_persistence.xml" />
@@ -47,6 +66,7 @@
 				<property name="generateDdl" value="true" />
 				<property name="databasePlatform" value="org.hibernate.dialect.DerbyTenSevenDialect" />
 				<!-- <property name="databasePlatform" value="org.hibernate.dialect.HSQLDialect" />-->
+				<!-- <property name="databasePlatform" value="org.hibernate.dialect.MySQL5Dialect" /> -->
 			</bean>
 		</property>
 	</bean>