LMS-1552 unpacked web application has moved

SVN: 16795

openbis_all/source/bash/has-config-changed.sh

@@ -27,7 +27,7 @@ function compare_configs {
 
 compare_configs $CONFIG_DIR/datastore_server-service.properties ~/sprint/datastore_server/etc/service.properties
 SERVER_DIR=~/sprint/openBIS-server/jetty
-WEBAPP_DIR=$SERVER_DIR/work/openbis/webapp
+WEBAPP_DIR=$SERVER_DIR/webapps/openbis
 compare_configs $CONFIG_DIR/service.properties $WEBAPP_DIR/WEB-INF/classes/service.properties
 compare_configs $CONFIG_DIR/openbis.conf $SERVER_DIR/bin/openbis.conf
 compare_configs $CONFIG_DIR/images/ $WEBAPP_DIR/images/

openbis_all/source/bash/sprint_post_install.sh

@@ -20,7 +20,7 @@ export PLASMIDS=bs-openbis02.ethz.ch
 function create_individual_greeting_message {
 # Creates an individual greeting message
 	if [ -f ~openbis/config/openbis_instance.txt ]; then
-	   export OPENBIS_DICT=~openbis/sprint/openBIS-server/jetty/work/openbis/webapp/common-dictionary.js
+	   export OPENBIS_DICT=~openbis/sprint/openBIS-server/jetty/webapps/openbis/common-dictionary.js
 	   export SERVER_INSTANCE_NAME=`cat ~openbis/config/openbis_instance.txt`
 	   perl -pe 's/openbis_instance: "",/openbis_instance: "$ENV{SERVER_INSTANCE_NAME}",/' -i $OPENBIS_DICT
 	fi
@@ -29,12 +29,12 @@ function create_individual_greeting_message {
 function restore_common {
   if [ -f ~openbis/config/loginHeader.html ]; then
     echo restoring loginHeader.html...
-    cp -r ~openbis/config/images ~openbis/sprint/openBIS-server/jetty/work/openbis/webapp/
+    cp -r ~openbis/config/images ~openbis/sprint/openBIS-server/jetty/webapps/openbis/
     cp ~openbis/config/loginHeader.html ~openbis/sprint/openBIS-server/jetty/webapps/openbis/
-    cp ~openbis/config/help.html ~openbis/sprint/openBIS-server/jetty/work/openbis/webapp/
+    cp ~openbis/config/help.html ~openbis/sprint/openBIS-server/jetty/webapps/openbis/
   fi
   if [ -f ~openbis/config/index.html ]; then
-  	cp ~openbis/config/index.html  ~openbis/sprint/openBIS-server/jetty/work/openbis/webapp/
+  	cp ~openbis/config/index.html  ~openbis/sprint/openBIS-server/jetty/webapps/openbis/
   fi  
   if  [ -f ~openbis/config/openbis-as-jetty.xml ]; then
   	cp ~openbis/config/openbis-as-jetty.xml ~openbis/sprint/openBIS-server/jetty/etc/jetty.xml

openbis_all/source/bash/sprint_post_install_agronomics.sh

@@ -5,5 +5,5 @@
 MPAF_DIR=/local0/data/dss_incoming/transcriptomics/mpaf
 [ -d $MPAF_DIR ] || mkdir -p $MPAF_DIR
 
-OPENBIS_SERVER_HOME=/localhome/openbis/sprint/openBIS-server/jetty/work/openbis/webapp
+OPENBIS_SERVER_HOME=/localhome/openbis/sprint/openBIS-server/jetty/webapps/openbis
 cp ~/config/Guide_to_Using_Agron-omics_openBIS.pdf $OPENBIS_SERVER_HOME
\ No newline at end of file