From ed31251b46802983cda7b7228149f99c9c5c9fdb Mon Sep 17 00:00:00 2001 From: fgerlits Date: Mon, 16 Oct 2006 15:03:23 +0000 Subject: [PATCH] more search-and-replace --- livesupport/bin/autogen.sh | 2 +- livesupport/bin/createDebianPackages.sh | 22 ++++++------ livesupport/bin/dist.sh | 27 +++++++-------- livesupport/bin/gen_coverage_data.sh | 2 +- livesupport/bin/livesupport-station | 32 ++++++++--------- livesupport/bin/postInstallStation.sh | 34 +++++++++---------- livesupport/bin/postUninstall.sh | 20 +++++------ livesupport/bin/preInstall.sh | 6 ++-- .../bin/setupDevelopmentEnvironment.sh | 4 +-- .../bin/setupDevelopmentEnvironmentAndLog.sh | 10 +++--- livesupport/bin/svnUpdate.sh | 4 +-- livesupport/bin/test_setup_db.sh | 6 ++-- livesupport/bin/updateStudioConfig.sh | 14 ++++---- livesupport/bin/user_setup.sh | 20 +++++------ livesupport/bin/user_setup_db.sh | 6 ++-- ...gLiveSupport.xml => campcaster-studio.xml} | 0 ...emplate => campcaster-studio.xml.template} | 0 ...te => campcaster-studio.xml.user-template} | 0 .../gLiveSupport/src/GLiveSupport.cxx | 4 +-- .../src/products/scheduler/etc/odbc_template | 2 +- .../products/scheduler/etc/odbc_test_template | 4 +-- 21 files changed, 109 insertions(+), 110 deletions(-) rename livesupport/src/products/gLiveSupport/etc/{gLiveSupport.xml => campcaster-studio.xml} (100%) rename livesupport/src/products/gLiveSupport/etc/{gLiveSupport.xml.template => campcaster-studio.xml.template} (100%) rename livesupport/src/products/gLiveSupport/etc/{gLiveSupport.xml.user-template => campcaster-studio.xml.user-template} (100%) diff --git a/livesupport/bin/autogen.sh b/livesupport/bin/autogen.sh index 6329daaca..b75a75243 100755 --- a/livesupport/bin/autogen.sh +++ b/livesupport/bin/autogen.sh @@ -31,7 +31,7 @@ # (based on the version in enlightenment's cvs) #------------------------------------------------------------------------------- -package="LiveSupport" +package="Campcaster" # assume we're in $basedir/bin reldir=`dirname $0`/.. diff --git a/livesupport/bin/createDebianPackages.sh b/livesupport/bin/createDebianPackages.sh index c088e691e..7a972ebfd 100755 --- a/livesupport/bin/createDebianPackages.sh +++ b/livesupport/bin/createDebianPackages.sh @@ -26,7 +26,7 @@ # Location : $URL$ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -# This script creates Debian packages from LiveSupport tarballs. +# This script creates Debian packages from Campcaster tarballs. # To create the tarballs first, see the dist.sh script. # # Invoke as: @@ -53,10 +53,10 @@ usrdir=`cd $basedir/usr; pwd;` #------------------------------------------------------------------------------- printUsage() { - echo "LiveSupport debian source package creation script"; + echo "Campcaster debian source package creation script"; echo "parameters"; echo ""; - echo " -d, --directory Place to look for the livesupport source"; + echo " -d, --directory Place to look for the campcaster source"; echo " tarballs [default: current directory]"; echo " -m, --maintainer The name and e-mail address of the package"; echo " maintainer."; @@ -128,7 +128,7 @@ else fi -echo "Creating Debian source packages for LiveSupport."; +echo "Creating Debian source packages for Campcaster."; echo ""; echo "Using the following parameters:"; echo ""; @@ -168,8 +168,8 @@ check_exe "sed" || exit 1; #------------------------------------------------------------------------------- # More definitions #------------------------------------------------------------------------------- -tarball=$directory/livesupport-$version.tar.bz2 -tarball_libs=$directory/livesupport-libraries-$version.tar.bz2 +tarball=$directory/campcaster-$version.tar.bz2 +tarball_libs=$directory/campcaster-libraries-$version.tar.bz2 if [ ! -f $tarball ]; then echo "source tarball $tarball not found in directory $directory"; @@ -182,7 +182,7 @@ if [ ! -f $tarball_libs ]; then fi -packageName=livesupport-$version +packageName=campcaster-$version packageNameOrig=$packageName.orig workdir=$tmpdir/debianize @@ -202,17 +202,17 @@ cd $workdir #------------------------------------------------------------------------------- echo "Extracting source tarballs..."; -# untar first, and rename as livesupport-$version.orig +# untar first, and rename as campcaster-$version.orig tar xfj $tarball tar xfj $tarball_libs mv $packageName $packageNameOrig -# untar again, and leave it as livesupport-$version +# untar again, and leave it as campcaster-$version tar xfj $tarball tar xfj $tarball_libs #------------------------------------------------------------------------------- -# Debianize the livesupport-$version sources +# Debianize the campcaster-$version sources #------------------------------------------------------------------------------- echo "Debianizing sources..."; @@ -239,7 +239,7 @@ dpkg-source -b $packageName $packageNameOrig #------------------------------------------------------------------------------- echo "Moving debian source package files to target directory..."; -mv -f livesupport_$version* $outdir +mv -f campcaster_$version* $outdir #------------------------------------------------------------------------------- diff --git a/livesupport/bin/dist.sh b/livesupport/bin/dist.sh index 03fd34503..93ff08927 100755 --- a/livesupport/bin/dist.sh +++ b/livesupport/bin/dist.sh @@ -26,10 +26,10 @@ # Location : $URL$ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -# This script creates a distribution tarball for livesupport. +# This script creates a distribution tarball for Campcaster. # Creates two tarballs: -# livesupport-.tar.bz2 - the LiveSupport source files -# livesupport-libraries-.tar.bz2 - dependent libraries +# campcaster-.tar.bz2 - the Campcaster source files +# campcaster-libraries-.tar.bz2 - dependent libraries # # Invoke as: # ./bin/dist.sh -v @@ -57,7 +57,7 @@ usrdir=`cd $basedir/usr; pwd;` #------------------------------------------------------------------------------- printUsage() { - echo "LiveSupport install script."; + echo "Campcaster install script."; echo "parameters"; echo ""; echo " -d, --directory Place the tarballs in the specified directory."; @@ -110,7 +110,7 @@ d=`cd $directory; pwd` directory=$d -echo "Creating tarballs for LiveSupport."; +echo "Creating tarballs for Campcaster."; echo ""; echo "Using the following parameters:"; echo ""; @@ -124,7 +124,7 @@ echo "" #------------------------------------------------------------------------------- if [ -f $basedir/Makefile ]; then echo "ERROR: make sure to run this script on a freshly checked-out copy"; - echo " of LiveSupport, with NO generated files!"; + echo " of Campcaster, with NO generated files!"; exit 1; fi @@ -132,10 +132,10 @@ fi #------------------------------------------------------------------------------- # More definitions #------------------------------------------------------------------------------- -tarball=$directory/livesupport-$version.tar.bz2 -tarball_libs=$directory/livesupport-libraries-$version.tar.bz2 +tarball=$directory/campcaster-$version.tar.bz2 +tarball_libs=$directory/campcaster-libraries-$version.tar.bz2 -ls_tmpdir=$tmpdir/livesupport-$version +ls_tmpdir=$tmpdir/campcaster-$version src_tmpdir=$ls_tmpdir/src tools_tmpdir=$src_tmpdir/tools modules_tmpdir=$src_tmpdir/modules @@ -231,14 +231,13 @@ cp -pPR README INSTALL configure $ls_tmpdir #------------------------------------------------------------------------------- # Get rid of the remnants of the subversion system #------------------------------------------------------------------------------- -# Paul Baranowski: you dont need to do this when you export from SVN. -#rm -rf `find $ls_tmpdir -name .svn -type d` +rm -rf `find $ls_tmpdir -name .svn -type d` #------------------------------------------------------------------------------- # Create the main configure script #------------------------------------------------------------------------------- -cd $tmpdir/livesupport-$version +cd $tmpdir/campcaster-$version ./bin/autogen.sh cd $basedir @@ -247,7 +246,7 @@ cd $basedir # Create the tarball #------------------------------------------------------------------------------- cd $tmpdir -tar cfj $tarball livesupport-$version +tar cfj $tarball campcaster-$version cd $basedir @@ -323,7 +322,7 @@ rm -rf `find $ls_tmpdir -name .svn -type d` # Create the libraries tarball #------------------------------------------------------------------------------- cd $tmpdir -tar cfj $tarball_libs livesupport-$version +tar cfj $tarball_libs campcaster-$version cd $basedir diff --git a/livesupport/bin/gen_coverage_data.sh b/livesupport/bin/gen_coverage_data.sh index 997115cf3..6914efda6 100755 --- a/livesupport/bin/gen_coverage_data.sh +++ b/livesupport/bin/gen_coverage_data.sh @@ -28,7 +28,7 @@ #------------------------------------------------------------------------------- # This script generates code coverage data for all modules #------------------------------------------------------------------------------- -module="LiveSupport" +module="Campcaster" reldir=`dirname $0`/.. basedir=`cd $reldir; pwd;` diff --git a/livesupport/bin/livesupport-station b/livesupport/bin/livesupport-station index 516ff344c..20985f0ee 100755 --- a/livesupport/bin/livesupport-station +++ b/livesupport/bin/livesupport-station @@ -2,48 +2,48 @@ # # -LIVESUPPORT_DIR=/opt/livesupport -LIVESUPPORT_BIN=$LIVESUPPORT_DIR/bin -LIVESUPPORT_ETC=$LIVESUPPORT_DIR/etc -LIVESUPPORT_LIB=$LIVESUPPORT_DIR/lib -GSTREAMER_DIR=`find $LIVESUPPORT_LIB -type d -name "gstreamer-*"` +CAMPCASTER_DIR=/opt/campcaster +CAMPCASTER_BIN=$CAMPCASTER_DIR/bin +CAMPCASTER_ETC=$CAMPCASTER_DIR/etc +CAMPCASTER_LIB=$CAMPCASTER_DIR/lib +GSTREAMER_DIR=`find $CAMPCASTER_LIB -type d -name "gstreamer-*"` -PATH=/sbin:/bin:/usr/sbin:/usr/bin:$LIVESUPPORT_BIN -LD_LIBRARY_PATH=$LIVESUPPORT_LIB:$LD_LIBRARY_PATH -DAEMON=$LIVESUPPORT_BIN/scheduler -NAME=livesupport-scheduler -DESC="livesupport scheduler" +PATH=/sbin:/bin:/usr/sbin:/usr/bin:$CAMPCASTER_BIN +LD_LIBRARY_PATH=$CAMPCASTER_LIB:$LD_LIBRARY_PATH +DAEMON=$CAMPCASTER_BIN/scheduler +NAME=campcaster-scheduler +DESC="campcaster scheduler" test -x $DAEMON || exit 0 export PATH export LD_LIBRARY_PATH -DAEMON_OPTS="-c $LIVESUPPORT_ETC/scheduler.xml" +DAEMON_OPTS="-c $CAMPCASTER_ETC/scheduler.xml" set -e case "$1" in start) echo -n "Starting $DESC: " - $DAEMON -c $LIVESUPPORT_ETC/scheduler.xml start > /dev/null + $DAEMON -c $CAMPCASTER_ETC/scheduler.xml start > /dev/null echo "$NAME." ;; stop) echo -n "Stopping $DESC: " - $DAEMON -c $LIVESUPPORT_ETC/scheduler.xml stop > /dev/null + $DAEMON -c $CAMPCASTER_ETC/scheduler.xml stop > /dev/null echo "$NAME." ;; restart|force-reload) echo -n "Restarting $DESC: " - $DAEMON -c $LIVESUPPORT_ETC/scheduler.xml stop > /dev/null + $DAEMON -c $CAMPCASTER_ETC/scheduler.xml stop > /dev/null sleep 1 - $DAEMON -c $LIVESUPPORT_ETC/scheduler.xml start > /dev/null + $DAEMON -c $CAMPCASTER_ETC/scheduler.xml start > /dev/null echo "$NAME." ;; kill) echo -n "Killing $DESC: " - $DAEMON -c $LIVESUPPORT_ETC/scheduler.xml kill > /dev/null + $DAEMON -c $CAMPCASTER_ETC/scheduler.xml kill > /dev/null echo "$NAME." ;; *) diff --git a/livesupport/bin/postInstallStation.sh b/livesupport/bin/postInstallStation.sh index 8cfc62699..0fbff0969 100755 --- a/livesupport/bin/postInstallStation.sh +++ b/livesupport/bin/postInstallStation.sh @@ -26,7 +26,7 @@ # Location : $URL$ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -# This script makes post-installation steps for the LiveSupport Station. +# This script makes post-installation steps for the Campcaster Station. # # Invoke as: # ./bin/postInstallStation.sh @@ -48,12 +48,12 @@ bindir=$basedir/bin #------------------------------------------------------------------------------- printUsage() { - echo "LiveSupport scheduler post-install script."; + echo "Campcaster Station post-install script."; echo "parameters"; echo ""; echo " -d, --directory The installation directory, required."; - echo " -D, --database The name of the LiveSupport database."; - echo " [default: LiveSupport]"; + echo " -D, --database The name of the Campcaster database."; + echo " [default: Campcaster]"; echo " -g, --apache-group The group the apache daemon runs as."; echo " [default: www-data]"; echo " -r, --www-root The root directory for web documents served"; @@ -61,9 +61,9 @@ printUsage() echo " -s, --dbserver The name of the database server host."; echo " [default: localhost]"; echo " -u, --dbuser The name of the database user to access the" - echo " database. [default: livesupport]"; + echo " database. [default: campcaster]"; echo " -w, --dbpassword The database user password."; - echo " [default: livesupport]"; + echo " [default: campcaster]"; echo " -p, --postgresql-dir The postgresql data directory, containing"; echo " pg_hba.conf [default: /etc/postgresql]"; echo " -i, --postgresql-init-script The name of the postgresql init"; @@ -133,15 +133,15 @@ if [ "x$dbserver" == "x" ]; then fi if [ "x$database" == "x" ]; then - database=LiveSupport; + database=Campcaster; fi if [ "x$dbuser" == "x" ]; then - dbuser=livesupport; + dbuser=campcaster; fi if [ "x$dbpassword" == "x" ]; then - dbpassword=livesupport; + dbpassword=campcaster; fi if [ "x$apache_group" == "x" ]; then @@ -160,7 +160,7 @@ if [ "x$www_root" == "x" ]; then www_root=/var/www; fi -echo "Making post-install steps for the LiveSupport scheduler."; +echo "Making post-install steps for Campcaster Station."; echo ""; echo "Using the following installation parameters:"; echo ""; @@ -189,7 +189,7 @@ install_bin=$installdir/bin install_etc=$installdir/etc install_lib=$installdir/lib install_usr=$installdir/usr -install_var_ls=$installdir/var/LiveSupport +install_var_ls=$installdir/var/Campcaster #------------------------------------------------------------------------------- @@ -252,7 +252,7 @@ echo "Modifying postgresql access permissions..."; pg_config_dir=$postgresql_dir pg_config_file=pg_hba.conf -pg_config_file_saved=pg_hba.conf.before-livesupport +pg_config_file_saved=pg_hba.conf.before-campcaster if [ -f $pg_config_dir/$pg_config_file ] ; then mv -f $pg_config_dir/$pg_config_file $pg_config_dir/$pg_config_file_saved ; @@ -331,12 +331,12 @@ if [ "x$odbcinst_template" != "x" ] && [ "x$odbcinst_res" == "x" ]; then odbcinst -i -d -v -f $odbcinst_template || exit 1; fi -echo "Registering LiveSupport ODBC data source..."; +echo "Registering Campcaster ODBC data source..."; odbcinst -i -s -l -f $odbc_template || exit 1; #------------------------------------------------------------------------------- -# Install PEAR packages (locally in the LiveSupport) +# Install PEAR packages (locally in the Campcaster) # only if necessary #------------------------------------------------------------------------------- if [ -f $install_usr/lib/pear/bin/install.sh ]; then @@ -379,7 +379,7 @@ chmod g+sw $install_var_ls/htmlUI/var/html/img # Configuring Apache #------------------------------------------------------------------------------- echo "Configuring apache ..." -CONFFILE=90_php_livesupport.conf +CONFFILE=90_php_campcaster.conf AP_DDIR_FOUND=no for APACHE_DDIR in \ /etc/apache/conf.d /etc/apache2/conf.d /etc/apache2/conf/modules.d \ @@ -431,8 +431,8 @@ echo "done" echo "Creating symlinks..."; # create symlink for the PHP pages in apache's document root -rm -f $www_root/livesupport -ln -s $install_var_ls $www_root/livesupport +rm -f $www_root/campcaster +ln -s $install_var_ls $www_root/campcaster #------------------------------------------------------------------------------- diff --git a/livesupport/bin/postUninstall.sh b/livesupport/bin/postUninstall.sh index bb1d8543a..b6fe0e357 100755 --- a/livesupport/bin/postUninstall.sh +++ b/livesupport/bin/postUninstall.sh @@ -26,7 +26,7 @@ # Location : $URL$ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -# This script makes post-uninstallation steps for LiveSupport. +# This script makes post-uninstallation steps for Campcaster. # # Invoke as: # ./bin/postUninstall.sh @@ -50,18 +50,18 @@ tmpdir=$basedir/tmp #------------------------------------------------------------------------------- printUsage() { - echo "LiveSupport post-uninstall script."; + echo "Campcaster post-uninstall script."; echo "parameters"; echo ""; echo " -d, --directory The installation directory, required."; - echo " -D, --database The name of the LiveSupport database."; - echo " [default: LiveSupport]"; + echo " -D, --database The name of the Campcaster database."; + echo " [default: Campcaster]"; echo " -r, --www-root The root directory for web documents served"; echo " by apache [default: /var/www]"; echo " -s, --dbserver The name of the database server host."; echo " [default: localhost]"; echo " -u, --dbuser The name of the database user to access the" - echo " database. [default: livesupport]"; + echo " database. [default: campcaster]"; echo " -h, --help Print this message and exit."; echo ""; } @@ -115,11 +115,11 @@ if [ "x$dbserver" == "x" ]; then fi if [ "x$database" == "x" ]; then - database=LiveSupport; + database=Campcaster; fi if [ "x$dbuser" == "x" ]; then - dbuser=livesupport; + dbuser=campcaster; fi if [ "x$www_root" == "x" ]; then @@ -127,7 +127,7 @@ if [ "x$www_root" == "x" ]; then fi -echo "Making post-uninstall steps for LiveSupport."; +echo "Making post-uninstall steps for Campcaster."; echo ""; echo "Using the following installation parameters:"; echo ""; @@ -196,7 +196,7 @@ check_exe "odbcinst" || exit 1; echo "Removing symlinks..."; # remove symlink for the PHP pages in apache's document root -rm -f $www_root/livesupport +rm -f $www_root/campcaster #------------------------------------------------------------------------------- @@ -219,7 +219,7 @@ rm -rf $installdir/var/archiveServer/var/trans/* #------------------------------------------------------------------------------- echo "Removing ODBC data source and driver..."; -echo "Removing LiveSupport ODBC data source..."; +echo "Removing Campcaster ODBC data source..."; odbcinst -u -s -l -n $ls_database || exit 1; echo "De-registering ODBC PostgreSQL driver..."; diff --git a/livesupport/bin/preInstall.sh b/livesupport/bin/preInstall.sh index a495c94e8..c948b452b 100755 --- a/livesupport/bin/preInstall.sh +++ b/livesupport/bin/preInstall.sh @@ -26,7 +26,7 @@ # Location : $URL$ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -# This script makes pre-install steps and checks for LiveSupport. +# This script makes pre-install steps and checks for Campcaster. # # Invoke as: # ./bin/preInstall.sh @@ -56,7 +56,7 @@ usrdir=`cd $basedir/usr; pwd;` #------------------------------------------------------------------------------- printUsage() { - echo "LiveSupport pre-install script."; + echo "Campcaster pre-install script."; echo "parameters"; echo ""; echo " -g, --apache-group The group the apache daemon runs as."; @@ -96,7 +96,7 @@ if [ "x$apache_group" == "x" ]; then fi -echo "Making pre-install steps for LiveSupport."; +echo "Making pre-install steps for Campcaster."; echo ""; echo "Using the following installation parameters:"; echo ""; diff --git a/livesupport/bin/setupDevelopmentEnvironment.sh b/livesupport/bin/setupDevelopmentEnvironment.sh index 1332bcaa2..fb2c77ad5 100755 --- a/livesupport/bin/setupDevelopmentEnvironment.sh +++ b/livesupport/bin/setupDevelopmentEnvironment.sh @@ -26,7 +26,7 @@ # Location : $URL$ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -# A script to set up the development environment for LiveSupport +# A script to set up the development environment for Campcaster # # Invoke as: # ./bin/setupDevelopmentEnvironment.sh @@ -54,7 +54,7 @@ usrdir=`cd $basedir/usr; pwd;` #------------------------------------------------------------------------------- printUsage() { - echo "LiveSupport development environment setup script."; + echo "Campcaster development environment setup script."; echo "parameters"; echo ""; echo " -g, --apache-group The group the apache daemon runs as."; diff --git a/livesupport/bin/setupDevelopmentEnvironmentAndLog.sh b/livesupport/bin/setupDevelopmentEnvironmentAndLog.sh index b27a54343..a99066af6 100755 --- a/livesupport/bin/setupDevelopmentEnvironmentAndLog.sh +++ b/livesupport/bin/setupDevelopmentEnvironmentAndLog.sh @@ -26,7 +26,7 @@ # Location : $URL$ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -# A script to set up the development environment for LiveSupport +# A script to set up the development environment for Campcaster # # Invoke as: # ./bin/setupDevelopmentEnvironmentAndLog.sh @@ -48,7 +48,7 @@ usrdir=`cd $basedir/usr; pwd;` #------------------------------------------------------------------------------- printUsage() { - echo "LiveSupport development environment setup script."; + echo "Campcaster development environment setup script."; echo "parameters"; echo ""; echo " -g, --apache-group The group the apache daemon runs as."; @@ -120,9 +120,9 @@ ls -l $logdir/make_modprod_distclean_setup.log \ # --with-create-database=no =yes --with-create-odbc-data-source=no =yes # --with-init-database=no =yes # -# --with-database=LiveSupport =LiveSupport-test -# --with-database-user=livesupport =test -# --with-database-password=livesupport =test +# --with-database=Campcaster =Campcaster-test +# --with-database-user=campcaster =test +# --with-database-password=campcaster =test # # --with-station-audio-out=default # --with-studio-audio-out=default diff --git a/livesupport/bin/svnUpdate.sh b/livesupport/bin/svnUpdate.sh index d7bc5b83e..06a2b6010 100755 --- a/livesupport/bin/svnUpdate.sh +++ b/livesupport/bin/svnUpdate.sh @@ -27,7 +27,7 @@ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -# This script runs cvs to update the LiveSupport source code. +# This script runs cvs to update the Campcaster source code. #------------------------------------------------------------------------------- reldir=`dirname $0`/.. @@ -37,7 +37,7 @@ tmpdir=$basedir/tmp logdir=$basedir/tmp echo ""; -echo "The LiveSupport source code will be updated now ... and logged in"; +echo "The Campcaster source code will be updated now ... and logged in"; echo "$logdir"; echo ""; diff --git a/livesupport/bin/test_setup_db.sh b/livesupport/bin/test_setup_db.sh index 0479c5a9e..fc1ce4694 100755 --- a/livesupport/bin/test_setup_db.sh +++ b/livesupport/bin/test_setup_db.sh @@ -26,7 +26,7 @@ # Location : $URL$ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -# This script sets up the test database for LiveSupport +# This script sets up the test database for Campcaster #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- @@ -48,13 +48,13 @@ scheduler_bindir=${scheduler_dir}/bin usrdir=`cd $basedir/usr; pwd;` -installlog=/tmp/livesupport_install.log +installlog=/tmp/campcaster_install.log #------------------------------------------------------------------------------- # The details of the setup #------------------------------------------------------------------------------- -ls_database=LiveSupport-test +ls_database=Campcaster-test ls_dbuser=test ls_dbpassword=test ls_dbserver=localhost diff --git a/livesupport/bin/updateStudioConfig.sh b/livesupport/bin/updateStudioConfig.sh index 2c3d56216..b003201fb 100755 --- a/livesupport/bin/updateStudioConfig.sh +++ b/livesupport/bin/updateStudioConfig.sh @@ -26,7 +26,7 @@ # Location : $URL$ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -# This script updates the configuration file of gLiveSupport. +# This script updates the configuration file of Campcaster Studio. # # Invoke as: # ./bin/updateStudioConfig.sh @@ -50,7 +50,7 @@ tmpdir=$basedir/tmp #------------------------------------------------------------------------------- printUsage() { - echo "GLiveSupport post-install script."; + echo "Campcaster Studio post-install script."; echo "parameters"; echo ""; echo " -d, --directory The installation directory, required."; @@ -134,7 +134,7 @@ if [ "x$cue_alsa_device" == "x" ]; then cue_alsa_device="default"; fi -echo "Making post-install steps for GLiveSupport."; +echo "Making post-install steps for Campcaster Studio."; echo ""; echo "Using the following installation parameters:"; echo ""; @@ -151,7 +151,7 @@ echo "" #------------------------------------------------------------------------------- ls_php_host=$hostname ls_php_port=$http_port -ls_php_urlPrefix=livesupport +ls_php_urlPrefix=campcaster ls_alib_xmlRpcPrefix="xmlrpc/xrLocStor.php" ls_storage_xmlRpcPrefix="xmlrpc/xrLocStor.php" @@ -228,10 +228,10 @@ check_exe "sed" || exit 1; #------------------------------------------------------------------------------- echo "Customizing configuration files..." -# customize the gLiveSupport config file -cat $install_etc/gLiveSupport.xml.template \ +# customize the Campcaster Studio config file +cat $install_etc/campcaster-studio.xml.template \ | sed -e "$replace_sed_string" \ - > $install_etc/gLiveSupport.xml + > $install_etc/campcaster-studio.xml #------------------------------------------------------------------------------- diff --git a/livesupport/bin/user_setup.sh b/livesupport/bin/user_setup.sh index bec11db9c..de6f92b6a 100755 --- a/livesupport/bin/user_setup.sh +++ b/livesupport/bin/user_setup.sh @@ -58,7 +58,7 @@ usrdir=`cd $basedir/usr; pwd;` #------------------------------------------------------------------------------- printUsage() { - echo "LiveSupport local user settings setup script."; + echo "Campcaster local user settings setup script."; echo "parameters"; echo ""; echo " -g, --apache-group The group the apache daemon runs as."; @@ -105,17 +105,17 @@ hostname=localhost http_port=80 scheduler_port=`expr $scheduler_base_port + $UID` dbserver=localhost -database=LiveSupport-$user +database=Campcaster-$user dbuser=test dbpassword=test homedir=$HOME -configdir=$homedir/.livesupport +configdir=$homedir/.campcaster htmldir=$homedir/public_html output_device=default cue_device=default -echo "Configuring LiveSupport development environment for user $user."; +echo "Configuring Campcaster development environment for user $user."; echo ""; echo "Using the following installation parameters:"; echo ""; @@ -155,7 +155,7 @@ installdir=$usrdir ls_php_host=$hostname ls_php_port=$http_port -ls_php_urlPrefix=~$user/livesupport +ls_php_urlPrefix=~$user/campcaster ls_alib_xmlRpcPrefix="xmlrpc/xrLocStor.php" ls_storage_xmlRpcPrefix="xmlrpc/xrLocStor.php" @@ -308,9 +308,9 @@ cat $products_dir/scheduler/etc/scheduler.xml.template \ | sed -e "$replace_sed_string" \ > $configdir/scheduler.xml -cat $products_dir/gLiveSupport/etc/gLiveSupport.xml.user-template \ +cat $products_dir/gLiveSupport/etc/campcaster-studio.xml.user-template \ | sed -e "$replace_sed_string" \ - > $configdir/gLiveSupport.xml + > $configdir/campcaster-studio.xml cat $products_dir/gLiveSupport/etc/authenticationClient.xml.user-template \ | sed -e "$replace_sed_string" \ @@ -328,9 +328,9 @@ echo "Creating public HTML directory and links to web interfaces..." mkdir -p $htmldir -rm -f $htmldir/livesupport +rm -f $htmldir/campcaster -ln -s $modules_dir $htmldir/livesupport +ln -s $modules_dir $htmldir/campcaster #------------------------------------------------------------------------------- @@ -382,7 +382,7 @@ cp $modules_dir/htmlUI/var/redirect.php $modules_dir/htmlUI/var/index.php # Say goodbye #------------------------------------------------------------------------------- echo ""; -echo "The HTML user interface for the LiveSupport development environment"; +echo "The HTML user interface for the Campcaster development environment"; echo "for user $user is available at:"; echo "http://$ls_php_host:$ls_php_port/$ls_php_urlPrefix/htmlUI/var"; echo ""; diff --git a/livesupport/bin/user_setup_db.sh b/livesupport/bin/user_setup_db.sh index a172cb8c1..e1680de6c 100755 --- a/livesupport/bin/user_setup_db.sh +++ b/livesupport/bin/user_setup_db.sh @@ -59,7 +59,7 @@ usrdir=`cd $basedir/usr; pwd;` #------------------------------------------------------------------------------- printUsage() { - echo "LiveSupport user database setup script."; + echo "Campcaster user database setup script."; echo "parameters:"; echo ""; echo " -u, --user The user to set up the environment for."; @@ -101,7 +101,7 @@ if [ "x$user" == "x" ]; then fi -echo "Creating the LiveSupport user database"; +echo "Creating the Campcaster user database"; echo "for user: $user."; echo "" @@ -111,7 +111,7 @@ echo "" #------------------------------------------------------------------------------- postgres_user=postgres -ls_database=LiveSupport-$user +ls_database=Campcaster-$user ls_dbuser=test ls_dbpassword=test ls_dbserver=localhost diff --git a/livesupport/src/products/gLiveSupport/etc/gLiveSupport.xml b/livesupport/src/products/gLiveSupport/etc/campcaster-studio.xml similarity index 100% rename from livesupport/src/products/gLiveSupport/etc/gLiveSupport.xml rename to livesupport/src/products/gLiveSupport/etc/campcaster-studio.xml diff --git a/livesupport/src/products/gLiveSupport/etc/gLiveSupport.xml.template b/livesupport/src/products/gLiveSupport/etc/campcaster-studio.xml.template similarity index 100% rename from livesupport/src/products/gLiveSupport/etc/gLiveSupport.xml.template rename to livesupport/src/products/gLiveSupport/etc/campcaster-studio.xml.template diff --git a/livesupport/src/products/gLiveSupport/etc/gLiveSupport.xml.user-template b/livesupport/src/products/gLiveSupport/etc/campcaster-studio.xml.user-template similarity index 100% rename from livesupport/src/products/gLiveSupport/etc/gLiveSupport.xml.user-template rename to livesupport/src/products/gLiveSupport/etc/campcaster-studio.xml.user-template diff --git a/livesupport/src/products/gLiveSupport/src/GLiveSupport.cxx b/livesupport/src/products/gLiveSupport/src/GLiveSupport.cxx index 205f34f27..2310fc733 100644 --- a/livesupport/src/products/gLiveSupport/src/GLiveSupport.cxx +++ b/livesupport/src/products/gLiveSupport/src/GLiveSupport.cxx @@ -93,12 +93,12 @@ namespace { /*------------------------------------------------------------------------------ * The name of the configuration file for this class *----------------------------------------------------------------------------*/ -const std::string configFileDirStr = "/.livesupport/"; +const std::string configFileDirStr = "/.campcaster/"; /*------------------------------------------------------------------------------ * The name of the configuration file for this class *----------------------------------------------------------------------------*/ -const std::string configFileNameStr = "gLiveSupport.xml"; +const std::string configFileNameStr = "campcaster-studio.xml"; /*------------------------------------------------------------------------------ * The name of the config element for the list of supported languages diff --git a/livesupport/src/products/scheduler/etc/odbc_template b/livesupport/src/products/scheduler/etc/odbc_template index 96309c96c..c39c50b98 100644 --- a/livesupport/src/products/scheduler/etc/odbc_template +++ b/livesupport/src/products/scheduler/etc/odbc_template @@ -1,5 +1,5 @@ [ls_database] -Description = the LiveSupport database at PostgreSQL +Description = the Campcaster database at PostgreSQL Driver = PostgreSQL Trace = No TraceFile = /tmp/sql.log diff --git a/livesupport/src/products/scheduler/etc/odbc_test_template b/livesupport/src/products/scheduler/etc/odbc_test_template index 1824b3a15..a2de7cc58 100644 --- a/livesupport/src/products/scheduler/etc/odbc_test_template +++ b/livesupport/src/products/scheduler/etc/odbc_test_template @@ -1,9 +1,9 @@ [LiveSupport-test] -Description = the LiveSupport database at PostgreSQL +Description = the Campcaster database at PostgreSQL Driver = PostgreSQL Trace = No TraceFile = /tmp/sql.log -Database = LiveSupport-test +Database = Campcaster-test Servername = localhost Username = Password =