diff --git a/sbin/configure_dm_webapp.sh b/sbin/configure_dm_webapp.sh index f896ed299e58dc994e25ec37a44ed949e5ace5fe..3180bdeabd65cf928840ec847c9b170bfdccaf68 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"