updating setup script for new product paths

setup.sh

@@ -35,13 +35,14 @@ if [ -z $DM_SUPPORT_DIR ]; then
         export DM_SUPPORT_DIR=`pwd`
     fi
 fi
+
 if [ ! -d $DM_SUPPORT_DIR ]; then
     echo "ERROR: $DM_SUPPORT_DIR directory does not exist. Developers should point DM_SUPPORT_DIR to the desired area." 
     unset DM_SUPPORT_DIR
     return 1
-else
-    export DM_GLASSFISH_DIR=$DM_SUPPORT_DIR/glassfish/$DM_HOST_ARCH
 fi
+export DM_OPT_DIR=$DM_SUPPORT_DIR/opt
+export DM_GLASSFISH_DIR=$DM_OPT_DIR/glassfish
 
 
 # Add to path only if directory exists.
@@ -53,11 +54,11 @@ prependPathIfDirExists() {
 }
 
 # Setup path and other variables
-prependPathIfDirExists $DM_SUPPORT_DIR/node/$DM_HOST_ARCH/bin
-prependPathIfDirExists $DM_SUPPORT_DIR/mongodb/$DM_HOST_ARCH/bin
-prependPathIfDirExists $DM_SUPPORT_DIR/postgresql/$DM_HOST_ARCH/bin
-prependPathIfDirExists $DM_SUPPORT_DIR/java/$DM_HOST_ARCH/bin
-prependPathIfDirExists $DM_SUPPORT_DIR/ant/bin
+prependPathIfDirExists $DM_OPT_DIR/node/$DM_HOST_ARCH/bin
+prependPathIfDirExists $DM_OPT_DIR/mongodb/$DM_HOST_ARCH/bin
+prependPathIfDirExists $DM_OPT_DIR/postgresql/$DM_HOST_ARCH/bin
+prependPathIfDirExists $DM_OPT_DIR/java/$DM_HOST_ARCH/bin
+prependPathIfDirExists $DM_OPT_DIR/ant/bin
 prependPathIfDirExists $DM_ROOT_DIR/bin
 PATH=.:$PATH
 export PATH
@@ -72,7 +73,7 @@ export LD_LIBRARY_PATH
 # Setup python path. 
 # Check if we have local python
 if [ -z $DM_PYTHON_DIR ]; then
-    pythonDir=$DM_SUPPORT_DIR/python/$DM_HOST_ARCH
+    pythonDir=$DM_OPT_DIR/python/$DM_HOST_ARCH
 else
     pythonDir=$DM_PYTHON_DIR
 fi
@@ -93,7 +94,7 @@ export PYTHONPATH
 
 # Setup postgres. 
 if [ -z $DM_POSTGRESQL_DIR ]; then
-    postgresqlDir=$DM_SUPPORT_DIR/postgresql/$DM_HOST_ARCH
+    postgresqlDir=$DM_OPT_DIR/postgresql/$DM_HOST_ARCH
 else
     postgresqlDir=$DM_POSTGRESQL_DIR 
 fi
@@ -106,7 +107,7 @@ if [ -d $postgresqlDir ]; then
 fi
 
 # Setup oracle libraries. 
-oracleDir=$DM_SUPPORT_DIR/opt/oracle-client/$DM_HOST_ARCH
+oracleDir=$DM_OPT_DIR/oracle-client/$DM_HOST_ARCH
 if [ -d $oracleDir ]; then
     LD_LIBRARY_PATH=$oracleDir:$LD_LIBRARY_PATH
     PATH=$oracleDir:$PATH