From 0f50993784e3e961dd0ed8041cc0f943eb8ac1ae Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Tue, 30 Sep 2014 18:45:41 +0000
Subject: [PATCH] postgres db source modification
---
sbin/configure_dm_webapp.sh | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/sbin/configure_dm_webapp.sh b/sbin/configure_dm_webapp.sh
index f896ed29..3180bdea 100755
--- a/sbin/configure_dm_webapp.sh
+++ b/sbin/configure_dm_webapp.sh
@@ -48,13 +48,13 @@ DM_DB_HOST=${DM_DB_HOST:=localhost}
DM_DB_PORT=${DM_DB_PORT:=11136}
DM_DB_USER=${DM_DB_USER:=dm}
DM_DB_PASSWORD=${DM_DB_PASSWORD:=dm}
-DM_DB_POOL=mysql_${DM_DB_NAME}_DbPool
+DM_DB_POOL=postgresql_${DM_DB_NAME}_DbPool
DM_DATA_SOURCE=${DM_DB_NAME}_DataSource
DM_DOMAIN=domain1
-# copy mysql driver
-echo "Copying mysql driver"
-rsync -ar $DM_ROOT_DIR/src/java/DmWebPortal/lib/mysql-connector-java-5.1.23-bin.jar $GLASSFISH_DIR/glassfish/domains/${DM_DOMAIN}/lib/ext
+# copy db driver
+#echo "Copying db driver"
+#rsync -ar $DM_ROOT_DIR/src/java/DmWebPortal/lib/mysql-connector-java-5.1.23-bin.jar $GLASSFISH_DIR/glassfish/domains/${DM_DOMAIN}/lib/ext
# restart server
echo "Restarting glassfish"
@@ -63,7 +63,7 @@ $ASADMIN_CMD start-domain ${DM_DOMAIN}
# create JDBC connection pool
echo "Creating JDBC connection pool $DM_DB_POOL"
-$ASADMIN_CMD create-jdbc-connection-pool --datasourceclassname com.mysql.jdbc.jdbc2.optional.MysqlDataSource --restype javax.sql.DataSource --property user=${DM_DB_USER}:password=${DM_DB_PASSWORD}:driverClass="com.mysql.jdbc.Driver":portNumber=${DM_DB_PORT}:databaseName=${DM_DB_NAME}:serverName=${DM_DB_HOST}:url="jdbc\:mysql\://${DM_DB_HOST}\:${DM_DB_PORT}/${DM_DB_NAME}?zeroDateTimeBehavior\=convertToNull" ${DM_DB_POOL}
+$ASADMIN_CMD create-jdbc-connection-pool --datasourceclassname org.postgresql.ds.PGSimpleDataSource --restype javax.sql.DataSource --property user=${DM_DB_USER}:password=${DM_DB_PASSWORD}:driverClass="org.postgresql.Driver":portNumber=${DM_DB_PORT}:databaseName=${DM_DB_NAME}:serverName=${DM_DB_HOST}:url="jdbc\:postgresql\://${DM_DB_HOST}\:${DM_DB_PORT}/${DM_DB_NAME}" ${DM_DB_POOL}
# create JDBC resource associated with this connection pool
echo "Creating JDBC resource $DM_DATA_SOURCE"
--
GitLab