work on webapp config/deployment scripts

sbin/configure_dm_webapp.sh

@@ -38,8 +38,8 @@ else
 fi
 
 DM_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
-GLASSFISH_DIR=$DM_SUPPORT/glassfish/$DM_HOST_ARCH
-JAVA_HOME=$DM_SUPPORT/java/$DM_HOST_ARCH
+GLASSFISH_DIR=$DM_SUPPORT_DIR/glassfish/$DM_HOST_ARCH
+JAVA_HOME=$DM_SUPPORT_DIR/java/$DM_HOST_ARCH
 
 export AS_JAVA=$JAVA_HOME
 ASADMIN_CMD=$GLASSFISH_DIR/bin/asadmin 
@@ -53,8 +53,8 @@ DM_DATA_SOURCE=${DM_DB_NAME}_DataSource
 DM_DOMAIN=domain1
 
 # 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
+echo "Copying db driver"
+rsync -ar $DM_ROOT_DIR/src/java/DmWebPortal/lib/postgresql-9.3-1102.jdbc41.jar $GLASSFISH_DIR/glassfish/domains/${DM_DOMAIN}/lib/ext
 
 # restart server
 echo "Restarting glassfish"

sbin/deploy_dm_webapp.sh

 #!/bin/sh
 
 #
-# Script used for deploying CMS webapp
-# Deployment configuration can be set in etc/$CMS_DB_NAME.deploy.conf file
+# Script used for deploying DM webapp
+# Deployment configuration can be set in etc/$DM_DB_NAME.deploy.conf file
 #
 # Usage:
 #
-# $0 [CMS_DB_NAME]
+# $0 [DM_DB_NAME]
 #
 
 MY_DIR=`dirname $0` && cd $MY_DIR && MY_DIR=`pwd`
-if [ -z "${CMS_ROOT_DIR}" ]; then
-    CMS_ROOT_DIR=$MY_DIR/..
+if [ -z "${DM_ROOT_DIR}" ]; then
+    DM_ROOT_DIR=$MY_DIR/..
 fi
-CMS_ENV_FILE=${CMS_ROOT_DIR}/setup.sh
-if [ ! -f ${CMS_ENV_FILE} ]; then
-    echo "Environment file ${CMS_ENV_FILE} does not exist." 
+DM_ENV_FILE=${DM_ROOT_DIR}/setup.sh
+if [ ! -f ${DM_ENV_FILE} ]; then
+    echo "Environment file ${DM_ENV_FILE} does not exist." 
     exit 2
 fi
-. ${CMS_ENV_FILE} > /dev/null
+. ${DM_ENV_FILE} > /dev/null
 
 # Use first argument as db name, if provided
-CMS_DB_NAME=${CMS_DB_NAME:=cms}
+DM_DB_NAME=${DM_DB_NAME:=dm}
 if [ ! -z "$1" ]; then
-    CMS_DB_NAME=$1
+    DM_DB_NAME=$1
 fi
-echo "Using DB name: $CMS_DB_NAME"
+echo "Using DB name: $DM_DB_NAME"
 
 # Look for deployment file in etc directory, and use it to override
 # default entries
-deployConfigFile=$CMS_ROOT_DIR/etc/${CMS_DB_NAME}.deploy.conf
+deployConfigFile=$DM_ROOT_DIR/etc/${DM_DB_NAME}.deploy.conf
 if [ -f $deployConfigFile ]; then
     echo "Using deployment config file: $deployConfigFile"
     . $deployConfigFile
@@ -37,55 +37,55 @@ else
     echo "Deployment config file $deployConfigFile not found, using defaults"
 fi
 
-CMS_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
-CMS_CONTEXT_ROOT=${CMS_CONTEXT_ROOT:=cms}
-GLASSFISH_DIR=$CMS_SUPPORT/glassfish/$CMS_HOST_ARCH
-CMS_DEPLOY_DIR=$GLASSFISH_DIR/glassfish/domains/domain1/autodeploy
-CMS_DIST_DIR=$CMS_ROOT_DIR/src/java/CmsWebPortal/dist
-CMS_BUILD_WAR_FILE=CmsWebPortal.war
-CMS_WAR_FILE=$CMS_CONTEXT_ROOT.war
-JAVA_HOME=$CMS_SUPPORT/java/$CMS_HOST_ARCH
+DM_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
+DM_CONTEXT_ROOT=${DM_CONTEXT_ROOT:=dm}
+GLASSFISH_DIR=$DM_SUPPORT_DIR/glassfish/$DM_HOST_ARCH
+DM_DEPLOY_DIR=$GLASSFISH_DIR/glassfish/domains/domain1/autodeploy
+DM_DIST_DIR=$DM_ROOT_DIR/src/java/DmWebPortal/dist
+DM_BUILD_WAR_FILE=DmWebPortal.war
+DM_WAR_FILE=$DM_CONTEXT_ROOT.war
+JAVA_HOME=$DM_SUPPORT_DIR/java/$DM_HOST_ARCH
 
-if [ ! -f $CMS_DIST_DIR/$CMS_BUILD_WAR_FILE ]; then
-    echo "$CMS_BUILD_WAR_FILE not found in $CMS_DIST_DIR."
+if [ ! -f $DM_DIST_DIR/$DM_BUILD_WAR_FILE ]; then
+    echo "$DM_BUILD_WAR_FILE not found in $DM_DIST_DIR."
     exit 1
 fi
 
 # Modify war file for proper context/persistence settings and
 # repackage it into new war 
-echo "Repackaging war file for context root $CMS_CONTEXT_ROOT"
-cd $CMS_DIST_DIR
-rm -rf $CMS_CONTEXT_ROOT
-mkdir -p $CMS_CONTEXT_ROOT
-cd $CMS_CONTEXT_ROOT
-jar xf ../$CMS_BUILD_WAR_FILE
+echo "Repackaging war file for context root $DM_CONTEXT_ROOT"
+cd $DM_DIST_DIR
+rm -rf $DM_CONTEXT_ROOT
+mkdir -p $DM_CONTEXT_ROOT
+cd $DM_CONTEXT_ROOT
+jar xf ../$DM_BUILD_WAR_FILE
 
 configFile=WEB-INF/glassfish-web.xml
-cmd="cat $configFile | sed 's?<context-root.*?<context-root>${CMS_CONTEXT_ROOT}</context-root>?g' > $configFile.2 && mv $configFile.2 $configFile"
+cmd="cat $configFile | sed 's?<context-root.*?<context-root>${DM_CONTEXT_ROOT}</context-root>?g' > $configFile.2 && mv $configFile.2 $configFile"
 eval $cmd
 
 configFile=WEB-INF/classes/META-INF/persistence.xml
-cmd="cat $configFile | sed 's?<jta-data-source.*?<jta-data-source>${CMS_DB_NAME}_DataSource</jta-data-source>?g' > $configFile.2 && mv $configFile.2 $configFile"
+cmd="cat $configFile | sed 's?<jta-data-source.*?<jta-data-source>${DM_DB_NAME}_DataSource</jta-data-source>?g' > $configFile.2 && mv $configFile.2 $configFile"
 eval $cmd
 
-jar cf ../$CMS_WAR_FILE *
+jar cf ../$DM_WAR_FILE *
 
 export AS_JAVA=$JAVA_HOME
 ASADMIN_CMD=$GLASSFISH_DIR/bin/asadmin
 
 # copy war file
-echo "Copying war file $CMS_DIST_DIR/$CMS_WAR_FILE to $CMS_DEPLOY_DIR"
-rm -f $CMS_DEPLOY_DIR/${CMS_WAR_FILE}_*
-cp $CMS_DIST_DIR/$CMS_WAR_FILE $CMS_DEPLOY_DIR
+echo "Copying war file $DM_DIST_DIR/$DM_WAR_FILE to $DM_DEPLOY_DIR"
+rm -f $DM_DEPLOY_DIR/${DM_WAR_FILE}_*
+cp $DM_DIST_DIR/$DM_WAR_FILE $DM_DEPLOY_DIR
 
 # wait on deployment
 echo "Waiting on war deployment..."
 WAIT_TIME=30
-cd $CMS_DEPLOY_DIR
+cd $DM_DEPLOY_DIR
 t=0
 while [ $t -lt $WAIT_TIME ]; do
     sleep 1
-    deploymentStatus=`ls -c1 ${CMS_WAR_FILE}_* 2> /dev/null | sed 's?.*war_??g'`
+    deploymentStatus=`ls -c1 ${DM_WAR_FILE}_* 2> /dev/null | sed 's?.*war_??g'`
     if [ ! -z "$deploymentStatus" ]; then
         break
     fi

sbin/unconfigure_dm_webapp.sh

 #!/bin/sh
 
 #
-# Script used for un-configuring CMS webapp
-# Deployment configuration can be set in etc/$CMS_DB_NAME.deploy.conf file
+# Script used for un-configuring DM webapp
+# Deployment configuration can be set in etc/$DM_DB_NAME.deploy.conf file
 #
 # Usage:
 #
-# $0 [CMS_DB_NAME]
+# $0 [DM_DB_NAME]
 #
 
 MY_DIR=`dirname $0` && cd $MY_DIR && MY_DIR=`pwd`
-if [ -z "${CMS_ROOT_DIR}" ]; then
-    CMS_ROOT_DIR=$MY_DIR/..
+if [ -z "${DM_ROOT_DIR}" ]; then
+    DM_ROOT_DIR=$MY_DIR/..
 fi
-CMS_ENV_FILE=${CMS_ROOT_DIR}/setup.sh
-if [ ! -f ${CMS_ENV_FILE} ]; then
-    echo "Environment file ${CMS_ENV_FILE} does not exist." 
+DM_ENV_FILE=${DM_ROOT_DIR}/setup.sh
+if [ ! -f ${DM_ENV_FILE} ]; then
+    echo "Environment file ${DM_ENV_FILE} does not exist." 
     exit 2
 fi
-. ${CMS_ENV_FILE} > /dev/null
+. ${DM_ENV_FILE} > /dev/null
 
 # Use first argument as db name, if provided
-CMS_DB_NAME=${CMS_DB_NAME:=cms}
+DM_DB_NAME=${DM_DB_NAME:=dm}
 if [ ! -z "$1" ]; then
-    CMS_DB_NAME=$1
+    DM_DB_NAME=$1
 fi
-echo "Using DB name: $CMS_DB_NAME"
+echo "Using DB name: $DM_DB_NAME"
 
 # Look for deployment file in etc directory, and use it to override
 # default entries
-deployConfigFile=$CMS_ROOT_DIR/etc/${CMS_DB_NAME}.deploy.conf
+deployConfigFile=$DM_ROOT_DIR/etc/${DM_DB_NAME}.deploy.conf
 if [ -f $deployConfigFile ]; then
     echo "Using deployment config file: $deployConfigFile"
     . $deployConfigFile
@@ -37,28 +37,28 @@ else
     echo "Deployment config file $deployConfigFile not found, using defaults"
 fi
 
-CMS_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
-GLASSFISH_DIR=$CMS_SUPPORT/glassfish/$CMS_HOST_ARCH
-JAVA_HOME=$CMS_SUPPORT/java/$CMS_HOST_ARCH
+DM_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
+GLASSFISH_DIR=$DM_SUPPORT_DIR/glassfish/$DM_HOST_ARCH
+JAVA_HOME=$DM_SUPPORT_DIR/java/$DM_HOST_ARCH
 
 export AS_JAVA=$JAVA_HOME
 ASADMIN_CMD=$GLASSFISH_DIR/bin/asadmin 
 
-CMS_DB_POOL=mysql_${CMS_DB_NAME}_DbPool
-CMS_DATA_SOURCE=${CMS_DB_NAME}_DataSource
-CMS_DOMAIN=domain1
+DM_DB_POOL=postgresql_${DM_DB_NAME}_DbPool
+DM_DATA_SOURCE=${DM_DB_NAME}_DataSource
+DM_DOMAIN=domain1
 
 # restart server
 echo "Restarting glassfish"
-$ASADMIN_CMD stop-domain ${CMS_DOMAIN}
-$ASADMIN_CMD start-domain ${CMS_DOMAIN}
+$ASADMIN_CMD stop-domain ${DM_DOMAIN}
+$ASADMIN_CMD start-domain ${DM_DOMAIN}
 
 # delete JDBC resource associated with this connection pool
-echo "Deleting JDBC resource $CMS_DATA_SOURCE"
-$ASADMIN_CMD delete-jdbc-resource ${CMS_DATA_SOURCE}
+echo "Deleting JDBC resource $DM_DATA_SOURCE"
+$ASADMIN_CMD delete-jdbc-resource ${DM_DATA_SOURCE}
 
 # delete JDBC connection pool
-echo "Deleting JDBC connection pool $CMS_DB_POOL"
-$ASADMIN_CMD delete-jdbc-connection-pool ${CMS_DB_POOL}
+echo "Deleting JDBC connection pool $DM_DB_POOL"
+$ASADMIN_CMD delete-jdbc-connection-pool ${DM_DB_POOL}
 
 

sbin/undeploy_dm_webapp.sh

 #!/bin/sh
 
 #
-# Script used for undeploying CMS webapp
-# Deployment configuration can be set in etc/$CMS_DB_NAME.deploy.conf file
+# Script used for undeploying DM webapp
+# Deployment configuration can be set in etc/$DM_DB_NAME.deploy.conf file
 #
 # Usage:
 #
-# $0 [CMS_DB_NAME]
+# $0 [DM_DB_NAME]
 #
 
 MY_DIR=`dirname $0` && cd $MY_DIR && MY_DIR=`pwd`
-if [ -z "${CMS_ROOT_DIR}" ]; then
-    CMS_ROOT_DIR=$MY_DIR/..
+if [ -z "${DM_ROOT_DIR}" ]; then
+    DM_ROOT_DIR=$MY_DIR/..
 fi
-CMS_ENV_FILE=${CMS_ROOT_DIR}/setup.sh
-if [ ! -f ${CMS_ENV_FILE} ]; then
-    echo "Environment file ${CMS_ENV_FILE} does not exist." 
+DM_ENV_FILE=${DM_ROOT_DIR}/setup.sh
+if [ ! -f ${DM_ENV_FILE} ]; then
+    echo "Environment file ${DM_ENV_FILE} does not exist." 
     exit 2
 fi
-. ${CMS_ENV_FILE} > /dev/null
+. ${DM_ENV_FILE} > /dev/null
 
 # Use first argument as db name, if provided
-CMS_DB_NAME=${CMS_DB_NAME:=cms}
+DM_DB_NAME=${DM_DB_NAME:=dm}
 if [ ! -z "$1" ]; then
-    CMS_DB_NAME=$1
+    DM_DB_NAME=$1
 fi
-echo "Using DB name: $CMS_DB_NAME"
+echo "Using DB name: $DM_DB_NAME"
 
 # Look for deployment file in etc directory, and use it to override
 # default entries
-deployConfigFile=$CMS_ROOT_DIR/etc/${CMS_DB_NAME}.deploy.conf
+deployConfigFile=$DM_ROOT_DIR/etc/${DM_DB_NAME}.deploy.conf
 if [ -f $deployConfigFile ]; then
     echo "Using deployment config file: $deployConfigFile"
     . $deployConfigFile
@@ -37,34 +37,34 @@ else
     echo "Deployment config file $deployConfigFile not found, using defaults"
 fi
 
-CMS_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
-CMS_CONTEXT_ROOT=${CMS_CONTEXT_ROOT:=CmsWebPortal}
-GLASSFISH_DIR=$CMS_SUPPORT/glassfish/$CMS_HOST_ARCH
-CMS_DEPLOY_DIR=$GLASSFISH_DIR/glassfish/domains/domain1/autodeploy
-CMS_APP_DIR=$GLASSFISH_DIR/glassfish/domains/domain1/applications/$CMS_CONTEXT_ROOT
-CMS_DIST_DIR=$CMS_ROOT_DIR/src/java/CmsWebPortal/dist
-CMS_WAR_FILE=$CMS_CONTEXT_ROOT.war
-JAVA_HOME=$CMS_SUPPORT/java/$CMS_HOST_ARCH
+DM_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
+DM_CONTEXT_ROOT=${DM_CONTEXT_ROOT:=DmWebPortal}
+GLASSFISH_DIR=$DM_SUPPORT_DIR/glassfish/$DM_HOST_ARCH
+DM_DEPLOY_DIR=$GLASSFISH_DIR/glassfish/domains/domain1/autodeploy
+DM_APP_DIR=$GLASSFISH_DIR/glassfish/domains/domain1/applications/$DM_CONTEXT_ROOT
+DM_DIST_DIR=$DM_ROOT_DIR/src/java/DmWebPortal/dist
+DM_WAR_FILE=$DM_CONTEXT_ROOT.war
+JAVA_HOME=$DM_SUPPORT_DIR/java/$DM_HOST_ARCH
 
 export AS_JAVA=$JAVA_HOME
 ASADMIN_CMD=$GLASSFISH_DIR/bin/asadmin
 
 # remove war file from autodeploy directory
-echo "Removing war file $CMS_DEPLOY_DIR/$CMS_WAR_FILE"
-rm -f $CMS_DEPLOY_DIR/${CMS_WAR_FILE}*
+echo "Removing war file $DM_DEPLOY_DIR/$DM_WAR_FILE"
+rm -f $DM_DEPLOY_DIR/${DM_WAR_FILE}*
 
 # remove war file from autodeploy directory
-if [ -d $CMS_APP_DIR ]; then
-    echo "Removing application directory $CMS_APP_DIR"
-    rm -rf $CMS_APP_DIR
+if [ -d $DM_APP_DIR ]; then
+    echo "Removing application directory $DM_APP_DIR"
+    rm -rf $DM_APP_DIR
 else
-    echo "Application directory $CMS_APP_DIR not found"
+    echo "Application directory $DM_APP_DIR not found"
 fi
 
 # restart server
 echo "Restarting glassfish"
-$ASADMIN_CMD stop-domain ${CMS_DOMAIN}
-$ASADMIN_CMD start-domain ${CMS_DOMAIN}
+$ASADMIN_CMD stop-domain ${DM_DOMAIN}
+$ASADMIN_CMD start-domain ${DM_DOMAIN}