From 457ea4860e471e12ac0901645a7a905917cc4cbd Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Tue, 24 Jan 2017 02:38:34 +0000
Subject: [PATCH] web portal script changes that reflect new support directory
layout
---
etc/init.d/dm-glassfish | 6 +++---
sbin/dm_configure_web_portal.sh | 4 ++--
sbin/dm_deploy_web_portal.sh | 4 ++--
sbin/dm_unconfigure_web_portal.sh | 4 ++--
sbin/dm_undeploy_web_portal.sh | 4 ++--
.../nbproject/private/private.properties.orig | 10 ----------
src/java/DmWebPortal/src/java/dm.portal.properties | 4 ++--
src/python/dm/__init__.py | 2 +-
8 files changed, 14 insertions(+), 24 deletions(-)
delete mode 100644 src/java/DmWebPortal/nbproject/private/private.properties.orig
diff --git a/etc/init.d/dm-glassfish b/etc/init.d/dm-glassfish
index 2f1d0787..698d9df4 100755
--- a/etc/init.d/dm-glassfish
+++ b/etc/init.d/dm-glassfish
@@ -31,9 +31,9 @@ if [ ! -f ${DM_ENV_FILE} ]; then
fi
. ${DM_ENV_FILE} > /dev/null
-export AS_JAVA=$DM_SUPPORT_DIR/java/$DM_HOST_ARCH
-DM_GLASSFISH_DIR=$DM_SUPPORT_DIR/glassfish/$DM_HOST_ARCH
-DERBY_DIR=$DM_SUPPORT_DIR/glassfish/$DM_HOST_ARCH/javadb/bin
+export AS_JAVA=$DM_OPT_DIR/java/$DM_HOST_ARCH
+DM_GLASSFISH_DIR=$DM_OPT_DIR/glassfish
+DERBY_DIR=$DM_OPT_DIR/glassfish/javadb/bin
DM_DAEMON_NAME=glassfish
DM_DAEMON_CONTROL_CMD=$DM_GLASSFISH_DIR/bin/asadmin
diff --git a/sbin/dm_configure_web_portal.sh b/sbin/dm_configure_web_portal.sh
index efa49c4e..fa25a14f 100755
--- a/sbin/dm_configure_web_portal.sh
+++ b/sbin/dm_configure_web_portal.sh
@@ -41,8 +41,8 @@ DM_INSTALL_DIR=${DM_INSTALL_DIR:=$DM_ROOT_DIR/..}
DM_SYSTEM_PASSWORD_FILE=${DM_INSTALL_DIR}/etc/${DM_SYSTEM_USER}.system.passwd
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
+JAVA_HOME=$DM_OPT_DIR/java/$DM_HOST_ARCH
+GLASSFISH_DIR=$DM_OPT_DIR/glassfish
export AS_JAVA=$JAVA_HOME
ASADMIN_CMD=$GLASSFISH_DIR/bin/asadmin
diff --git a/sbin/dm_deploy_web_portal.sh b/sbin/dm_deploy_web_portal.sh
index 782b94f7..bb401cd4 100755
--- a/sbin/dm_deploy_web_portal.sh
+++ b/sbin/dm_deploy_web_portal.sh
@@ -37,11 +37,11 @@ else
echo "Deployment config file $deployConfigFile not found, using defaults"
fi
-JAVA_HOME=$DM_SUPPORT_DIR/java/$DM_HOST_ARCH
+JAVA_HOME=$DM_OPT_DIR/java/$DM_HOST_ARCH
DM_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
DM_HOSTNAME=`hostname -f`
DM_CONTEXT_ROOT=${DM_CONTEXT_ROOT:=dm}
-GLASSFISH_DIR=$DM_SUPPORT_DIR/glassfish/$DM_HOST_ARCH
+GLASSFISH_DIR=$DM_OPT_DIR/glassfish
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
diff --git a/sbin/dm_unconfigure_web_portal.sh b/sbin/dm_unconfigure_web_portal.sh
index accd877a..de8836c9 100755
--- a/sbin/dm_unconfigure_web_portal.sh
+++ b/sbin/dm_unconfigure_web_portal.sh
@@ -38,8 +38,8 @@ else
fi
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
+JAVA_HOME=$DM_OPT_DIR/java/$DM_HOST_ARCH
+GLASSFISH_DIR=$DM_OPT_DIR/glassfish
export AS_JAVA=$JAVA_HOME
ASADMIN_CMD=$GLASSFISH_DIR/bin/asadmin
diff --git a/sbin/dm_undeploy_web_portal.sh b/sbin/dm_undeploy_web_portal.sh
index 88cd23d3..cf7f9069 100755
--- a/sbin/dm_undeploy_web_portal.sh
+++ b/sbin/dm_undeploy_web_portal.sh
@@ -39,12 +39,12 @@ fi
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
+JAVA_HOME=$DM_OPT_DIR/java/$DM_HOST_ARCH
+GLASSFISH_DIR=$DM_OPT_DIR/glassfish
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
diff --git a/src/java/DmWebPortal/nbproject/private/private.properties.orig b/src/java/DmWebPortal/nbproject/private/private.properties.orig
deleted file mode 100644
index 817c2c02..00000000
--- a/src/java/DmWebPortal/nbproject/private/private.properties.orig
+++ /dev/null
@@ -1,10 +0,0 @@
-deploy.ant.properties.file=/home/sveseli/.netbeans/8.2/config/GlassFishEE6/Properties/gfv3-334529135.properties
-j2ee.platform.is.jsr109=true
-j2ee.server.domain=/home/sveseli/Work/netbeans/glassfish-4.1.1/glassfish/domains/domain1
-j2ee.server.home=/home/sveseli/Work/netbeans/glassfish-4.1.1/glassfish
-j2ee.server.instance=[/home/sveseli/Work/netbeans/glassfish-4.1.1/glassfish:/home/sveseli/Work/netbeans/glassfish-4.1.1/glassfish/domains/domain1]deployer:gfv3ee6wc:localhost:4848
-j2ee.server.middleware=/home/sveseli/Work/netbeans/glassfish-4.1.1
-javac.debug=true
-javadoc.preview=true
-selected.browser=default
-user.properties.file=/home/sveseli/.netbeans/8.2/build.properties
diff --git a/src/java/DmWebPortal/src/java/dm.portal.properties b/src/java/DmWebPortal/src/java/dm.portal.properties
index ffee7ae6..04752ec4 100644
--- a/src/java/DmWebPortal/src/java/dm.portal.properties
+++ b/src/java/DmWebPortal/src/java/dm.portal.properties
@@ -5,6 +5,6 @@
dm.portal.ldapUrl=ldaps://dmid-vm.xray.aps.anl.gov:636
dm.portal.ldapDnString=uid=USERNAME,ou=DM,ou=People,o=aps.anl.gov,dc=aps,dc=anl,dc=gov
-dm.dsWebService.url=https://xstor-devel:22236/dm
+dm.dsWebService.url=https://apsgpfs08:22236/dm
dm.system.user=dm
-dm.system.passwordFile=DM_INSTALL_DIR/etc/DM_SYSTEM_USER.system.passwd
\ No newline at end of file
+dm.system.passwordFile=DM_INSTALL_DIR/etc/DM_SYSTEM_USER.system.passwd
diff --git a/src/python/dm/__init__.py b/src/python/dm/__init__.py
index 2ac2c550..ccd277af 100644
--- a/src/python/dm/__init__.py
+++ b/src/python/dm/__init__.py
@@ -1 +1 @@
-__version__ = "0.16 (2017.01.05)"
+__version__ = "1.0 (2017.01.23)"
--
GitLab