Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Renaming to Campcaster

Browse source
This commit is contained in:
tomash 2006-10-16 00:20:26 +00:00
parent e0e9ee8a2c
commit 15cc93d63f
20 changed files with 147 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

48
livesupport/bin/archiveServerSetup.sh
View file

@ -2,22 +2,22 @@
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Copyright (c) 2004 Media Development Loan Fund # Copyright (c) 2004 Media Development Loan Fund
# #
# This file is part of the LiveSupport project. # This file is part of the Campcaster project.
# http://livesupport.campware.org/ # http://campcaster.campware.org/
# To report bugs, send an e-mail to bugs@campware.org # To report bugs, send an e-mail to bugs@campware.org
# #
# LiveSupport is free software; you can redistribute it and/or modify # Campcaster is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or # the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. # (at your option) any later version.
# #
# LiveSupport is distributed in the hope that it will be useful, # Campcaster is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with LiveSupport; if not, write to the Free Software # along with Campcaster; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# #
@ -26,7 +26,7 @@
# Location : $URL: svn+ssh://tomash@code.campware.org/home/svn/repo/livesupport/trunk/livesupport/bin/postInstallStation.sh $ # Location : $URL: svn+ssh://tomash@code.campware.org/home/svn/repo/livesupport/trunk/livesupport/bin/postInstallStation.sh $
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# This script makes installation steps for the LiveSupport network hub. # This script makes installation steps for the Campcaster network hub.
# #
# Invoke as: # Invoke as:
# ./bin/archiveServerSetup.sh # ./bin/archiveServerSetup.sh
@ -52,12 +52,12 @@ modules_dir=$srcdir/modules
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
printUsage() printUsage()
{ {
echo "LiveSupport network hub install script."; echo "Campcaster network hub install script.";
echo "parameters"; echo "parameters";
echo ""; echo "";
echo " -d, --directory The installation directory, required."; echo " -d, --directory The installation directory, required.";
echo " -D, --database The name of the LiveSupport database."; echo " -D, --database The name of the Campcaster database.";
echo " [default: LiveSupport]"; echo " [default: Campcaster]";
echo " -g, --apache-group The group the apache daemon runs as."; echo " -g, --apache-group The group the apache daemon runs as.";
echo " [default: www-data]"; echo " [default: www-data]";
echo " -r, --www-root The root directory for web documents served"; echo " -r, --www-root The root directory for web documents served";
@ -65,9 +65,9 @@ printUsage()
echo " -s, --dbserver The name of the database server host."; echo " -s, --dbserver The name of the database server host.";
echo " [default: localhost]"; echo " [default: localhost]";
echo " -u, --dbuser The name of the database user to access the" 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 " -w, --dbpassword The database user password.";
echo " [default: livesupport]"; echo " [default: campcaster]";
echo " -p, --postgresql-dir The postgresql data directory, containing"; echo " -p, --postgresql-dir The postgresql data directory, containing";
echo " pg_hba.conf [default: /etc/postgresql]"; echo " pg_hba.conf [default: /etc/postgresql]";
echo " -i, --postgresql-init-script The name of the postgresql init"; echo " -i, --postgresql-init-script The name of the postgresql init";
@ -137,15 +137,15 @@ if [ "x$dbserver" == "x" ]; then
fi fi
if [ "x$database" == "x" ]; then if [ "x$database" == "x" ]; then
database=LiveSupportHub; database=CampcasterHub;
fi fi
if [ "x$dbuser" == "x" ]; then if [ "x$dbuser" == "x" ]; then
dbuser=livesupport; dbuser=campcaster;
fi fi
if [ "x$dbpassword" == "x" ]; then if [ "x$dbpassword" == "x" ]; then
dbpassword=livesupport; dbpassword=campcaster;
fi fi
if [ "x$apache_group" == "x" ]; then if [ "x$apache_group" == "x" ]; then
@ -167,7 +167,7 @@ fi
hostname=`hostname -f` hostname=`hostname -f`
www_port=80 www_port=80
echo "Installing LiveSupport network hub (archiveServer)."; echo "Installing Campcaster network hub (archiveServer).";
echo ""; echo "";
echo "Using the following installation parameters:"; echo "Using the following installation parameters:";
echo ""; echo "";
@ -198,7 +198,7 @@ install_bin=$installdir/bin
install_etc=$installdir/etc install_etc=$installdir/etc
install_lib=$installdir/lib install_lib=$installdir/lib
install_usr=$installdir/usr install_usr=$installdir/usr
install_var_ls=$installdir/var/LiveSupport install_var_ls=$installdir/var/Campcaster
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -260,7 +260,7 @@ echo "Modifying postgresql access permissions...";
pg_config_dir=$postgresql_dir pg_config_dir=$postgresql_dir
pg_config_file=pg_hba.conf 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 if [ -f $pg_config_dir/$pg_config_file ] ; then
mv -vf $pg_config_dir/$pg_config_file $pg_config_dir/$pg_config_file_saved ; mv -vf $pg_config_dir/$pg_config_file $pg_config_dir/$pg_config_file_saved ;
@ -278,7 +278,7 @@ ${postgresql_init_script} start
# Configuring Apache # Configuring Apache
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
echo "Configuring apache ..." echo "Configuring apache ..."
CONFFILE=90_php_livesupport.conf CONFFILE=90_php_campcaster.conf
AP_DDIR_FOUND=no AP_DDIR_FOUND=no
for APACHE_DDIR in \ for APACHE_DDIR in \
/etc/apache/conf.d /etc/apache2/conf.d /etc/apache2/conf/modules.d \ /etc/apache/conf.d /etc/apache2/conf.d /etc/apache2/conf/modules.d \
@ -380,10 +380,10 @@ cd $modules_dir/getid3 && ./configure --prefix=$installdir
#cd $modules_dir/htmlUI && ./configure --prefix=$installdir \ #cd $modules_dir/htmlUI && ./configure --prefix=$installdir \
# --with-apache-group=$apache_group \ # --with-apache-group=$apache_group \
# --with-www-docroot=$www_root \ # --with-www-docroot=$www_root \
# --with-storage-server=$installdir/var/LiveSupport/storageServer # --with-storage-server=$installdir/var/Campcaster/storageServer
cd $modules_dir/storageAdmin && ./configure --prefix=$installdir \ cd $modules_dir/storageAdmin && ./configure --prefix=$installdir \
--with-storage-server=$installdir/var/LiveSupport/storageServer \ --with-storage-server=$installdir/var/Campcaster/storageServer \
--with-phppart-dir=$installdir/var/LiveSupport/storageAdmin --with-phppart-dir=$installdir/var/Campcaster/storageAdmin
cd $modules_dir/storageServer && \ cd $modules_dir/storageServer && \
./configure --prefix=$installdir \ ./configure --prefix=$installdir \
--with-apache-group=$apache_group \ --with-apache-group=$apache_group \
@ -420,12 +420,12 @@ done
echo "Creating symlinks..."; echo "Creating symlinks...";
# create symlink for the PHP pages in apache's document root # create symlink for the PHP pages in apache's document root
rm -f $www_root/livesupport rm -f $www_root/campcaster
ln -vs $install_var_ls $www_root/livesupport ln -vs $install_var_ls $www_root/campcaster
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Install PEAR packages (locally in the LiveSupport) # Install PEAR packages (locally in the Campcaster)
# only if necessary # only if necessary
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
if [ -f $toolsdir/pear/bin/install.sh ]; then if [ -f $toolsdir/pear/bin/install.sh ]; then

26
livesupport/bin/createAServerTarball.sh
View file

@ -2,22 +2,22 @@
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Copyright (c) 2004 Media Development Loan Fund # Copyright (c) 2004 Media Development Loan Fund
# #
# This file is part of the LiveSupport project. # This file is part of the Campcaster project.
# http://livesupport.campware.org/ # http://campcaster.campware.org/
# To report bugs, send an e-mail to bugs@campware.org # To report bugs, send an e-mail to bugs@campware.org
# #
# LiveSupport is free software; you can redistribute it and/or modify # Campcaster is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or # the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. # (at your option) any later version.
# #
# LiveSupport is distributed in the hope that it will be useful, # Campcaster is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with LiveSupport; if not, write to the Free Software # along with Campcaster; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# #
@ -26,8 +26,8 @@
# Location : $URL: svn+ssh://tomash@code.campware.org/home/svn/repo/livesupport/trunk/livesupport/bin/postInstallStation.sh $ # Location : $URL: svn+ssh://tomash@code.campware.org/home/svn/repo/livesupport/trunk/livesupport/bin/postInstallStation.sh $
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# This script creates a distribution tarball for livesupport network hub. # This script creates a distribution tarball for Campcaster network hub.
# (livesupport-aserver-<version>.tar.bz2) # (campcaster-aserver-<version>.tar.bz2)
# #
# Invoke as: # Invoke as:
# ./bin/makeArchiveServerTar.sh -v <version.number> # ./bin/makeArchiveServerTar.sh -v <version.number>
@ -58,7 +58,7 @@ usrdir=`cd $basedir/usr; pwd;`
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
printUsage() printUsage()
{ {
echo "LiveSupport network hub tar package creator."; echo "Campcaster network hub tar package creator.";
echo "parameters"; echo "parameters";
echo ""; echo "";
echo " -d, --directory Place the tarball in the specified directory."; echo " -d, --directory Place the tarball in the specified directory.";
@ -107,7 +107,7 @@ if [ "x$version" == "x" ]; then
exit 1; exit 1;
fi fi
echo "Creating LiveSupport network hub tar.gz package."; echo "Creating Campcaster network hub tar.gz package.";
echo ""; echo "";
echo "Using the following installation parameters:"; echo "Using the following installation parameters:";
echo ""; echo "";
@ -120,16 +120,16 @@ echo ""
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
if [ -f $basedir/Makefile ]; then if [ -f $basedir/Makefile ]; then
echo "ERROR: make sure to run this script on a freshly checked-out copy"; 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; exit 1;
fi fi
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# More definitions # More definitions
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
tarball=$directory/livesupport-aserver-$version.tar.bz2 tarball=$directory/campcaster-aserver-$version.tar.bz2
ls_tmpdir=$tmpdir/livesupport-$version ls_tmpdir=$tmpdir/campcaster-$version
src_tmpdir=$ls_tmpdir/src src_tmpdir=$ls_tmpdir/src
tools_tmpdir=$src_tmpdir/tools tools_tmpdir=$src_tmpdir/tools
modules_tmpdir=$src_tmpdir/modules modules_tmpdir=$src_tmpdir/modules
@ -221,7 +221,7 @@ cp -pPR README INSTALL configure $ls_tmpdir
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
echo "Creating $tarball ..."; echo "Creating $tarball ...";
cd $tmpdir cd $tmpdir
tar cjf $tarball livesupport-$version tar cjf $tarball campcaster-$version
cd $basedir cd $basedir
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------

0
livesupport/etc/apache/90_php_livesupport.conf → livesupport/etc/apache/90_php_campcaster.conf
View file

13
livesupport/src/modules/archiveServer/etc/Makefile.in
View file

@ -2,20 +2,20 @@
# ArchiveServer - central archive component # ArchiveServer - central archive component
# Copyright (c) 2004 Media Development Loan Fund # Copyright (c) 2004 Media Development Loan Fund
# #
# This file is part of the LiveSupport project. # This file is part of the Campcaster project.
# #
# LiveSupport is free software; you can redistribute it and/or modify # Campcaster is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or # the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. # (at your option) any later version.
# #
# LiveSupport is distributed in the hope that it will be useful, # Campcaster is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with LiveSupport; if not, write to the Free Software # along with Campcaster; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# #
@ -79,7 +79,7 @@ TRANS_DIR = ${PHP_DIR}/trans
BUFF_DIR = ${STOR_DIR}/buffer BUFF_DIR = ${STOR_DIR}/buffer
TEST_RUNNER = ${PHP_DIR}/xmlrpc/testRunner.sh TEST_RUNNER = ${PHP_DIR}/xmlrpc/testRunner.sh
DEST_DIR = ${USR_VAR_DIR}/LiveSupport/archiveServer/var DEST_DIR = ${USR_VAR_DIR}/Campcaster/archiveServer/var
HOSTNAME = @HOSTNAME@ HOSTNAME = @HOSTNAME@
WWW_PORT = @WWW_PORT@ WWW_PORT = @WWW_PORT@
@ -88,7 +88,7 @@ DATABASE = @DATABASE@
DB_USER = @DB_USER@ DB_USER = @DB_USER@
DB_PASSWORD = @DB_PASSWORD@ DB_PASSWORD = @DB_PASSWORD@
PHP_URL_PREFIX=livesupport PHP_URL_PREFIX=campcaster
USR_LIB_DIR_S=$(shell ${ECHO} ${USR_LIB_DIR} | ${SED} -e "s/\//\\\\\\\\\//g") USR_LIB_DIR_S=$(shell ${ECHO} ${USR_LIB_DIR} | ${SED} -e "s/\//\\\\\\\\\//g")
PHP_URL_PREFIX_S=$(shell ${ECHO} ${PHP_URL_PREFIX} | ${SED} -e "s/\//\\\\\\\\\//g") PHP_URL_PREFIX_S=$(shell ${ECHO} ${PHP_URL_PREFIX} | ${SED} -e "s/\//\\\\\\\\\//g")
@ -106,7 +106,6 @@ REPLACE_SED_STRING="s/ls_lib_dir/${USR_LIB_DIR_S}/; \
# ls_storageUrlPath shouldn't be replaced by string ending with # ls_storageUrlPath shouldn't be replaced by string ending with
# 'storageServer/var' # 'storageServer/var'
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Configuration parameters # Configuration parameters
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------

24
livesupport/src/modules/archiveServer/etc/configure.ac
View file

@ -1,22 +1,22 @@
dnl----------------------------------------------------------------------------- dnl-----------------------------------------------------------------------------
dnl Copyright (c) 2004 Media Development Loan Fund dnl Copyright (c) 2004 Media Development Loan Fund
dnl dnl
dnl This file is part of the LiveSupport project. dnl This file is part of the Campcaster project.
dnl http://livesupport.campware.org/ dnl http://campcaster.campware.org/
dnl To report bugs, send an e-mail to bugs@campware.org dnl To report bugs, send an e-mail to bugs@campware.org
dnl dnl
dnl LiveSupport is free software; you can redistribute it and/or modify dnl Campcaster is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation; either version 2 of the License, or dnl the Free Software Foundation; either version 2 of the License, or
dnl (at your option) any later version. dnl (at your option) any later version.
dnl dnl
dnl LiveSupport is distributed in the hope that it will be useful, dnl Campcaster is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details. dnl GNU General Public License for more details.
dnl dnl
dnl You should have received a copy of the GNU General Public License dnl You should have received a copy of the GNU General Public License
dnl along with LiveSupport; if not, write to the Free Software dnl along with Campcaster; if not, write to the Free Software
dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
dnl dnl
dnl dnl
@ -80,14 +80,14 @@ AC_MSG_RESULT([using database server: ${DB_SERVER}])
dnl----------------------------------------------------------------------------- dnl-----------------------------------------------------------------------------
dnl get the name of the LiveSupport database dnl get the name of the Campcaster database
dnl----------------------------------------------------------------------------- dnl-----------------------------------------------------------------------------
AC_SUBST(DATABASE) AC_SUBST(DATABASE)
AC_ARG_WITH([database], AC_ARG_WITH([database],
AC_HELP_STRING([--with-database], AC_HELP_STRING([--with-database],
[the name of the postgresql database to use (LiveSupport)]), [the name of the postgresql database to use (Campcaster)]),
[DATABASE=${withval}], [DATABASE=LiveSupport]) [DATABASE=${withval}], [DATABASE=Campcaster])
AC_MSG_RESULT([using database: ${DATABASE}]) AC_MSG_RESULT([using database: ${DATABASE}])
@ -99,8 +99,8 @@ AC_SUBST(DB_USER)
AC_ARG_WITH([database-user], AC_ARG_WITH([database-user],
AC_HELP_STRING([--with-database-user], AC_HELP_STRING([--with-database-user],
[use the specified database server user (livesupport)]), [use the specified database server user (campcaster)]),
[DB_USER=${withval}], [DB_USER=livesupport]) [DB_USER=${withval}], [DB_USER=campcaster])
AC_MSG_RESULT([using database server user: ${DB_USER}]) AC_MSG_RESULT([using database server user: ${DB_USER}])
@ -112,8 +112,8 @@ AC_SUBST(DB_PASSWORD)
AC_ARG_WITH([database-password], AC_ARG_WITH([database-password],
AC_HELP_STRING([--with-database-password], AC_HELP_STRING([--with-database-password],
[use the specified database server user password (livesupport)]), [use the specified database server user password (campcaster)]),
[DB_PASSWORD=${withval}], [DB_PASSWORD=livesupport]) [DB_PASSWORD=${withval}], [DB_PASSWORD=campcaster])
AC_MSG_RESULT([using database server user password: ${DB_PASSWORD}]) AC_MSG_RESULT([using database server user password: ${DB_PASSWORD}])

20
livesupport/src/modules/archiveServer/var/conf.php
View file

@ -3,22 +3,22 @@
Copyright (c) 2004 Media Development Loan Fund Copyright (c) 2004 Media Development Loan Fund
This file is part of the LiveSupport project. This file is part of the Campcaster project.
http://livesupport.campware.org/ http://campcaster.campware.org/
To report bugs, send an e-mail to bugs@campware.org To report bugs, send an e-mail to bugs@campware.org
LiveSupport is free software; you can redistribute it and/or modify Campcaster is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or the Free Software Foundation; either version 2 of the License, or
(at your option) any later version. (at your option) any later version.
LiveSupport is distributed in the hope that it will be useful, Campcaster is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with LiveSupport; if not, write to the Free Software along with Campcaster; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
@ -69,7 +69,7 @@ $config = array(
'password' => 'test', 'password' => 'test',
'hostspec' => 'localhost', 'hostspec' => 'localhost',
'phptype' => 'pgsql', 'phptype' => 'pgsql',
'database' => 'LiveSupport-test', 'database' => 'Campcaster-test',
), ),
'tblNamePrefix' => 'as_', 'tblNamePrefix' => 'as_',
@ -89,12 +89,12 @@ $config = array(
/* ==================================================== URL configuration */ /* ==================================================== URL configuration */
// on central archive side: archive is the storage ! // on central archive side: archive is the storage !
'storageUrlPath' => '/livesupportArchiveServer', 'storageUrlPath' => '/campcasterArchiveServer',
'storageXMLRPC' => 'xmlrpc/xrArchive.php', 'storageXMLRPC' => 'xmlrpc/xrArchive.php',
'storageUrlHost' => 'localhost', 'storageUrlHost' => 'localhost',
'storageUrlPort' => 80, 'storageUrlPort' => 80,
// have to be another remote archive: // have to be another remote archive:
#'archiveUrlPath' => '/livesupportArchiveServer', #'archiveUrlPath' => '/campcasterArchiveServer',
#'archiveXMLRPC' => 'xmlrpc/xrArchive.php', #'archiveXMLRPC' => 'xmlrpc/xrArchive.php',
#'archiveUrlHost' => 'localhost', #'archiveUrlHost' => 'localhost',
#'archiveUrlPort' => 80, #'archiveUrlPort' => 80,
@ -132,7 +132,7 @@ $config['sysSubjs'] = array(
$old_ip = get_include_path(); $old_ip = get_include_path();
set_include_path('.'.PATH_SEPARATOR.$config['pearPath'].PATH_SEPARATOR.$old_ip); set_include_path('.'.PATH_SEPARATOR.$config['pearPath'].PATH_SEPARATOR.$old_ip);
// see if a ~/.livesupport/archiveServer.conf.php exists, and // see if a ~/.campcaster/archiveServer.conf.php exists, and
// overwrite the settings from there if any // overwrite the settings from there if any
$this_file = null; $this_file = null;
@ -145,7 +145,7 @@ if(!is_null($this_file)){
$fileowner_id = fileowner($this_file); $fileowner_id = fileowner($this_file);
$fileowner_array = posix_getpwuid($fileowner_id); $fileowner_array = posix_getpwuid($fileowner_id);
$fileowner_homedir = $fileowner_array['dir']; $fileowner_homedir = $fileowner_array['dir'];
$home_conf = $fileowner_homedir . '/.livesupport/archiveServer.conf.php'; $home_conf = $fileowner_homedir . '/.campcaster/archiveServer.conf.php';
if (file_exists($home_conf)) { if (file_exists($home_conf)) {
$default_config = $config; $default_config = $config;
include $home_conf; include $home_conf;

8
livesupport/src/modules/archiveServer/var/xmlrpc/testRunner.sh
View file

@ -48,8 +48,8 @@ XMETADATA="<?xml version=\"1.0\"?>
METADATA="<?xml version=\"1.0\"?> METADATA="<?xml version=\"1.0\"?>
<audioClip> <audioClip>
<metadata <metadata
xmlns=\"http://mdlf.org/livesupport/elements/1.0/\" xmlns=\"http://mdlf.org/campcaster/elements/1.0/\"
xmlns:ls=\"http://mdlf.org/livesupport/elements/1.0/\" xmlns:ls=\"http://mdlf.org/campcaster/elements/1.0/\"
xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\"
xmlns:dcterms=\"http://purl.org/dc/terms/\" xmlns:dcterms=\"http://purl.org/dc/terms/\"
xmlns:xml=\"http://www.w3.org/XML/1998/namespace\" xmlns:xml=\"http://www.w3.org/XML/1998/namespace\"
@ -61,10 +61,10 @@ METADATA="<?xml version=\"1.0\"?>
METAREGEX="(<\\?xml version=\"1\\.0\"( encoding=\"UTF-8\")?\\?> )?\ METAREGEX="(<\\?xml version=\"1\\.0\"( encoding=\"UTF-8\")?\\?> )?\
<audioClip>\ <audioClip>\
<metadata\ <metadata\
xmlns=\"http://mdlf\\.org/livesupport/elements/1\\.0/\"\ xmlns=\"http://mdlf\\.org/campcaster/elements/1\\.0/\"\
xmlns:dc=\"http://purl\\.org/dc/elements/1\\.1/\"\ xmlns:dc=\"http://purl\\.org/dc/elements/1\\.1/\"\
xmlns:dcterms=\"http://purl\\.org/dc/terms/\"\ xmlns:dcterms=\"http://purl\\.org/dc/terms/\"\
xmlns:ls=\"http://mdlf\\.org/livesupport/elements/1\\.0/\"\ xmlns:ls=\"http://mdlf\\.org/campcaster/elements/1\\.0/\"\
xmlns:xml=\"http://www\\.w3\\.org/XML/1998/namespace\"\ xmlns:xml=\"http://www\\.w3\\.org/XML/1998/namespace\"\
>\ >\
<dc:title>Media title testRunner</dc:title>\ <dc:title>Media title testRunner</dc:title>\

2
livesupport/src/modules/archiveServer/var/xmlrpc/xr_cli_test.php
View file

@ -39,7 +39,7 @@ if($pars[0] == '-s'){
array_shift($pars); array_shift($pars);
$serverPath = array_shift($pars); $serverPath = array_shift($pars);
}else{ }else{
$serverPath = 'http://localhost:80/livesupportArchiveServer/xmlrpc/xrArchive.php'; $serverPath = 'http://localhost:80/campcasterArchiveServer/xmlrpc/xrArchive.php';
} }
$url = parse_url($serverPath); $url = parse_url($serverPath);

30
livesupport/src/modules/storageServer/bin/createDatabase.sh
View file

@ -2,22 +2,22 @@
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Copyright (c) 2004 Media Development Loan Fund # Copyright (c) 2004 Media Development Loan Fund
# #
# This file is part of the LiveSupport project. # This file is part of the Campcaster project.
# http://livesupport.campware.org/ # http://campcaster.campware.org/
# To report bugs, send an e-mail to bugs@campware.org # To report bugs, send an e-mail to bugs@campware.org
# #
# LiveSupport is free software; you can redistribute it and/or modify # Campcaster is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or # the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. # (at your option) any later version.
# #
# LiveSupport is distributed in the hope that it will be useful, # Campcaster is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with LiveSupport; if not, write to the Free Software # along with Campcaster; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# #
@ -26,7 +26,7 @@
# Location : $URL$ # Location : $URL$
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# This script reates the database used by LiveSupport # This script reates the database used by Campcaster
# #
# Invoke as: # Invoke as:
# ./bin/createDatabase.sh # ./bin/createDatabase.sh
@ -51,17 +51,17 @@ usrdir=$basedir/usr
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
printUsage() printUsage()
{ {
echo "LiveSupport scheduler database creation script."; echo "Campcaster scheduler database creation script.";
echo "parameters"; echo "parameters";
echo ""; echo "";
echo " -D, --database The name of the LiveSupport database."; echo " -D, --database The name of the Campcaster database.";
echo " [default: LiveSupport]"; echo " [default: Campcaster]";
echo " -s, --dbserver The name of the database server host."; echo " -s, --dbserver The name of the database server host.";
echo " [default: localhost]"; echo " [default: localhost]";
echo " -u, --dbuser The name of the database user to access the" 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 " -w, --dbpassword The database user password.";
echo " [default: livesupport]"; echo " [default: campcaster]";
echo " -h, --help Print this message and exit."; echo " -h, --help Print this message and exit.";
echo ""; echo "";
} }
@ -106,18 +106,18 @@ if [ "x$dbserver" == "x" ]; then
fi fi
if [ "x$database" == "x" ]; then if [ "x$database" == "x" ]; then
database=LiveSupport; database=Campcaster;
fi fi
if [ "x$dbuser" == "x" ]; then if [ "x$dbuser" == "x" ]; then
dbuser=livesupport; dbuser=campcaster;
fi fi
if [ "x$dbpassword" == "x" ]; then if [ "x$dbpassword" == "x" ]; then
dbpassword=livesupport; dbpassword=campcaster;
fi fi
echo "Creating database for LiveSupport scheduler."; echo "Creating database for Campcaster scheduler.";
echo ""; echo "";
echo "Using the following parameters:"; echo "Using the following parameters:";
echo ""; echo "";

16
livesupport/src/modules/storageServer/etc/Makefile.in
View file

@ -2,20 +2,20 @@
# StorageServer - file storage component # StorageServer - file storage component
# Copyright (c) 2004 Media Development Loan Fund # Copyright (c) 2004 Media Development Loan Fund
# #
# This file is part of the LiveSupport project. # This file is part of the Campcaster project.
# #
# LiveSupport is free software; you can redistribute it and/or modify # Campcaster is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or # the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. # (at your option) any later version.
# #
# LiveSupport is distributed in the hope that it will be useful, # Campcaster is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with LiveSupport; if not, write to the Free Software # along with Campcaster; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# #
@ -84,7 +84,7 @@ TEST_RUNNER = ${PHP_DIR}/xmlrpc/testRunner.sh
PEAR_TOOL_DIR = ${BASE_DIR}/../../tools/pear PEAR_TOOL_DIR = ${BASE_DIR}/../../tools/pear
PEAR_INSTALLER = ${PEAR_TOOL_DIR}/bin/install.sh PEAR_INSTALLER = ${PEAR_TOOL_DIR}/bin/install.sh
DEST_DIR = ${USR_VAR_DIR}/LiveSupport/storageServer/var DEST_DIR = ${USR_VAR_DIR}/Campcaster/storageServer/var
HOSTNAME = @HOSTNAME@ HOSTNAME = @HOSTNAME@
APACHE_GROUP = @APACHE_GROUP@ APACHE_GROUP = @APACHE_GROUP@
@ -96,7 +96,7 @@ DB_PASSWORD = @DB_PASSWORD@
SCHEDULER_PORT = @SCHEDULER_PORT@ SCHEDULER_PORT = @SCHEDULER_PORT@
WWW_DOCROOT = @WWW_DOCROOT@ WWW_DOCROOT = @WWW_DOCROOT@
PHP_URL_PREFIX=livesupport PHP_URL_PREFIX=campcaster
SCHEDULER_URL_PREFIX = SCHEDULER_URL_PREFIX =
SCHEDULER_XML_RPC_PREFIX = RC2 SCHEDULER_XML_RPC_PREFIX = RC2
@ -196,8 +196,8 @@ copy_files:
chmod g+sw ${DEST_DIR}/stor/buffer chmod g+sw ${DEST_DIR}/stor/buffer
chmod g+sw ${DEST_DIR}/trans chmod g+sw ${DEST_DIR}/trans
${RM} ${WWW_DOCROOT}/livesupport ${RM} ${WWW_DOCROOT}/campcaster
ln -sf ${USR_VAR_DIR}/LiveSupport ${WWW_DOCROOT}/livesupport ln -sf ${USR_VAR_DIR}/Campcaster ${WWW_DOCROOT}/campcaster
create_database: create_database:
ifeq (@CREATE_LS_DATABASE@,yes) ifeq (@CREATE_LS_DATABASE@,yes)

42
livesupport/src/modules/storageServer/etc/configure.ac
View file

@ -1,22 +1,22 @@
dnl----------------------------------------------------------------------------- dnl-----------------------------------------------------------------------------
dnl Copyright (c) 2004 Media Development Loan Fund dnl Copyright (c) 2004 Media Development Loan Fund
dnl dnl
dnl This file is part of the LiveSupport project. dnl This file is part of the Campcaster project.
dnl http://livesupport.campware.org/ dnl http://campcaster.campware.org/
dnl To report bugs, send an e-mail to bugs@campware.org dnl To report bugs, send an e-mail to bugs@campware.org
dnl dnl
dnl LiveSupport is free software; you can redistribute it and/or modify dnl Campcaster is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation; either version 2 of the License, or dnl the Free Software Foundation; either version 2 of the License, or
dnl (at your option) any later version. dnl (at your option) any later version.
dnl dnl
dnl LiveSupport is distributed in the hope that it will be useful, dnl Campcaster is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details. dnl GNU General Public License for more details.
dnl dnl
dnl You should have received a copy of the GNU General Public License dnl You should have received a copy of the GNU General Public License
dnl along with LiveSupport; if not, write to the Free Software dnl along with Campcaster; if not, write to the Free Software
dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
dnl dnl
dnl dnl
@ -40,33 +40,33 @@ AC_REVISION($Revision$)
AC_CONFIG_SRCDIR(../var/BasicStor.php) AC_CONFIG_SRCDIR(../var/BasicStor.php)
dnl----------------------------------------------------------------------------- dnl-----------------------------------------------------------------------------
dnl specify wether the LiveSupport database and user should be created dnl specify wether the Campcaster database and user should be created
dnl----------------------------------------------------------------------------- dnl-----------------------------------------------------------------------------
AC_SUBST(CREATE_LS_DATABASE) AC_SUBST(CREATE_LS_DATABASE)
AC_ARG_WITH([create-database], AC_ARG_WITH([create-database],
AC_HELP_STRING([--with-create-database], AC_HELP_STRING([--with-create-database],
[specify wether the LiveSupport database and database user [specify wether the Campcaster database and database user
should be created (no)]), should be created (no)]),
[CREATE_LS_DATABASE=${withval}], [CREATE_LS_DATABASE=${withval}],
[CREATE_LS_DATABASE=no]) [CREATE_LS_DATABASE=no])
AC_MSG_RESULT([creating LiveSupport database: ${CREATE_LS_DATABASE}]) AC_MSG_RESULT([creating Campcaster database: ${CREATE_LS_DATABASE}])
dnl----------------------------------------------------------------------------- dnl-----------------------------------------------------------------------------
dnl specify wether the LiveSupport database tables should be initialized dnl specify wether the Campcaster database tables should be initialized
dnl----------------------------------------------------------------------------- dnl-----------------------------------------------------------------------------
AC_SUBST(INIT_LS_DATABASE) AC_SUBST(INIT_LS_DATABASE)
AC_ARG_WITH([init-database], AC_ARG_WITH([init-database],
AC_HELP_STRING([--with-init-database], AC_HELP_STRING([--with-init-database],
[specify wether the LiveSupport database tables should be [specify wether the Campcaster database tables should be
initialized (no)]), initialized (no)]),
[INIT_LS_DATABASE=${withval}], [INIT_LS_DATABASE=${withval}],
[INIT_LS_DATABASE=no]) [INIT_LS_DATABASE=no])
AC_MSG_RESULT([initializing LiveSupport database: ${INIT_LS_DATABASE}]) AC_MSG_RESULT([initializing Campcaster database: ${INIT_LS_DATABASE}])
dnl----------------------------------------------------------------------------- dnl-----------------------------------------------------------------------------
@ -135,14 +135,14 @@ AC_MSG_RESULT([using database server: ${DB_SERVER}])
dnl----------------------------------------------------------------------------- dnl-----------------------------------------------------------------------------
dnl get the name of the LiveSupport database dnl get the name of the Campcaster database
dnl----------------------------------------------------------------------------- dnl-----------------------------------------------------------------------------
AC_SUBST(DATABASE) AC_SUBST(DATABASE)
AC_ARG_WITH([database], AC_ARG_WITH([database],
AC_HELP_STRING([--with-database], AC_HELP_STRING([--with-database],
[the name of the postgresql database to use (LiveSupport)]), [the name of the postgresql database to use (Campcaster)]),
[DATABASE=${withval}], [DATABASE=LiveSupport]) [DATABASE=${withval}], [DATABASE=Campcaster])
AC_MSG_RESULT([using database: ${DATABASE}]) AC_MSG_RESULT([using database: ${DATABASE}])
@ -154,8 +154,8 @@ AC_SUBST(DB_USER)
AC_ARG_WITH([database-user], AC_ARG_WITH([database-user],
AC_HELP_STRING([--with-database-user], AC_HELP_STRING([--with-database-user],
[use the specified database server user (livesupport)]), [use the specified database server user (campcaster)]),
[DB_USER=${withval}], [DB_USER=livesupport]) [DB_USER=${withval}], [DB_USER=campcaster])
AC_MSG_RESULT([using database server user: ${DB_USER}]) AC_MSG_RESULT([using database server user: ${DB_USER}])
@ -167,8 +167,8 @@ AC_SUBST(DB_PASSWORD)
AC_ARG_WITH([database-password], AC_ARG_WITH([database-password],
AC_HELP_STRING([--with-database-password], AC_HELP_STRING([--with-database-password],
[use the specified database server user password (livesupport)]), [use the specified database server user password (campcaster)]),
[DB_PASSWORD=${withval}], [DB_PASSWORD=livesupport]) [DB_PASSWORD=${withval}], [DB_PASSWORD=campcaster])
AC_MSG_RESULT([using database server user password: ${DB_PASSWORD}]) AC_MSG_RESULT([using database server user password: ${DB_PASSWORD}])
@ -180,7 +180,7 @@ AC_SUBST(WWW_DOCROOT)
AC_ARG_WITH([www-docroot], AC_ARG_WITH([www-docroot],
AC_HELP_STRING([--with-www-docroot], AC_HELP_STRING([--with-www-docroot],
[deploy LiveSupport under the specified docroot (/var/www)]), [deploy Campcaster under the specified docroot (/var/www)]),
[WWW_DOCROOT=${withval}], [WWW_DOCROOT=/var/www]) [WWW_DOCROOT=${withval}], [WWW_DOCROOT=/var/www])
AC_MSG_RESULT([using www document root: ${WWW_DOCROOT}]) AC_MSG_RESULT([using www document root: ${WWW_DOCROOT}])
@ -198,8 +198,8 @@ AC_MSG_NOTICE(
database name: ${DATABASE} database name: ${DATABASE}
database user: ${DB_USER} database user: ${DB_USER}
database user password: ${DB_PASSWORD} database user password: ${DB_PASSWORD}
creating LiveSupport database: ${CREATE_LS_DATABASE} creating Campcaster database: ${CREATE_LS_DATABASE}
initialize LiveSupport database: ${INIT_LS_DATABASE} initialize Campcaster database: ${INIT_LS_DATABASE}
www document root: ${WWW_DOCROOT} www document root: ${WWW_DOCROOT}
]) ])

6
livesupport/src/modules/storageServer/var/conf.php
View file

@ -117,8 +117,10 @@ $config = array(
'tmpRootPass' => 'q', 'tmpRootPass' => 'q',
/* =================================================== cron configuration */ /* =================================================== cron configuration */
'cronUserName' => 'www-data', # 'cronUserName' => 'www-data',
'lockfile' => dirname(__FILE__).'/cron/cron.lock', 'cronUserName' => 'apache',
# 'lockfile' => dirname(__FILE__).'/cron/cron.lock',
'lockfile' => dirname(__FILE__).'/../../storageServer/var/stor/buffer/cron.lock',
'cronfile' => dirname(__FILE__).'/cron/croncall.php', 'cronfile' => dirname(__FILE__).'/cron/croncall.php',
'paramdir' => dirname(__FILE__).'/cron/params', 'paramdir' => dirname(__FILE__).'/cron/params',
); );

10
livesupport/src/modules/storageServer/var/conf.php.template
View file

@ -3,22 +3,22 @@
Copyright (c) 2004 Media Development Loan Fund Copyright (c) 2004 Media Development Loan Fund
This file is part of the LiveSupport project. This file is part of the Campcaster project.
http://livesupport.campware.org/ http://campcaster.campware.org/
To report bugs, send an e-mail to bugs@campware.org To report bugs, send an e-mail to bugs@campware.org
LiveSupport is free software; you can redistribute it and/or modify Campcaster is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or the Free Software Foundation; either version 2 of the License, or
(at your option) any later version. (at your option) any later version.
LiveSupport is distributed in the hope that it will be useful, Campcaster is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with LiveSupport; if not, write to the Free Software along with Campcaster; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

10
livesupport/src/modules/storageServer/var/conf_only.php.template
View file

@ -3,22 +3,22 @@
Copyright (c) 2004 Media Development Loan Fund Copyright (c) 2004 Media Development Loan Fund
This file is part of the LiveSupport project. This file is part of the Campcaster project.
http://livesupport.campware.org/ http://campcaster.campware.org/
To report bugs, send an e-mail to bugs@campware.org To report bugs, send an e-mail to bugs@campware.org
LiveSupport is free software; you can redistribute it and/or modify Campcaster is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or the Free Software Foundation; either version 2 of the License, or
(at your option) any later version. (at your option) any later version.
LiveSupport is distributed in the hope that it will be useful, Campcaster is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with LiveSupport; if not, write to the Free Software along with Campcaster; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

4
livesupport/src/modules/storageServer/var/emptyMdata.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<audioClip> <audioClip>
<metadata <metadata
xmlns="http://mdlf.org/livesupport/elements/1.0/" xmlns="http://mdlf.org/campcaster/elements/1.0/"
xmlns:ls="http://mdlf.org/livesupport/elements/1.0/" xmlns:ls="http://mdlf.org/campcaster/elements/1.0/"
xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dcterms="http://purl.org/dc/terms/"
xmlns:xml="http://www.w3.org/XML/1998/namespace" xmlns:xml="http://www.w3.org/XML/1998/namespace"

4
livesupport/src/modules/storageServer/var/emptyPlaylist.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<playlist id="0000000000000000" playlength="00:00:00.000000"> <playlist id="0000000000000000" playlength="00:00:00.000000">
<metadata <metadata
xmlns="http://mdlf.org/livesupport/elements/1.0/" xmlns="http://mdlf.org/campcaster/elements/1.0/"
xmlns:ls="http://mdlf.org/livesupport/elements/1.0/" xmlns:ls="http://mdlf.org/campcaster/elements/1.0/"
xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dcterms="http://purl.org/dc/terms/"
xmlns:xml="http://www.w3.org/XML/1998/namespace" xmlns:xml="http://www.w3.org/XML/1998/namespace"

4
livesupport/src/modules/storageServer/var/emptyWebstream.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<audioClip> <audioClip>
<metadata <metadata
xmlns="http://mdlf.org/livesupport/elements/1.0/" xmlns="http://mdlf.org/campcaster/elements/1.0/"
xmlns:ls="http://mdlf.org/livesupport/elements/1.0/" xmlns:ls="http://mdlf.org/campcaster/elements/1.0/"
xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dcterms="http://purl.org/dc/terms/"
xmlns:xml="http://www.w3.org/XML/1998/namespace" xmlns:xml="http://www.w3.org/XML/1998/namespace"

2
livesupport/src/modules/storageServer/var/tests/transTest.php
View file

@ -36,7 +36,6 @@ if(PEAR::isError($r)){ echo "ERROR: ".$r->getMessage()."\n"; exit(1); }
echo "$r\n"; echo "$r\n";
*/ */
/* ========== STORE ========== */ /* ========== STORE ========== */
echo "# UPLOAD test:\n";
echo"# Login: ".($sessid = $gb->login('root', 'q'))."\n"; echo"# Login: ".($sessid = $gb->login('root', 'q'))."\n";
echo"# Store: "; echo"# Store: ";
@ -70,6 +69,7 @@ var_export($r); echo"\n";
/* ========== UPLOAD ========== */ /* ========== UPLOAD ========== */
echo "# UPLOAD test:\n";
echo"# uploadAudioClip2Hub: "; echo"# uploadAudioClip2Hub: ";
$r = $gb->upload2Hub($gunid); $r = $gb->upload2Hub($gunid);
if(PEAR::isError($r)){ echo "ERROR: ".$r->getMessage()."/".$r->getUserInfo()."\n"; exit(1); } if(PEAR::isError($r)){ echo "ERROR: ".$r->getMessage()."/".$r->getUserInfo()."\n"; exit(1); }

6
livesupport/src/modules/storageServer/var/tests/transTest.sh
View file

@ -208,18 +208,18 @@ deletePlaylist $PLID_
createPlaylistAndEdit $PLID_ "../tests/0000000000000001.xml" createPlaylistAndEdit $PLID_ "../tests/0000000000000001.xml"
upload2Hub $PLID_ upload2Hub $PLID_
for i in 1 2 3 4 5; do getTransportInfo $TRTOK; sleep 1; done for i in $(seq 5); do getTransportInfo $TRTOK; sleep 1; done
#sleep 10 #sleep 10
for i in 0000000000010001 0000000000010002; do echo $i for i in 0000000000010001 0000000000010002; do echo $i
# deleteAudioClip $i deleteAudioClip $i
done done
deletePlaylist $PLID_ deletePlaylist $PLID_
echo "STOP - press ENTER"; read key echo "STOP - press ENTER"; read key
downloadFromHub $PLID_ downloadFromHub $PLID_
for i in 1 2 3 4 5; do getTransportInfo $TRTOK; sleep 1; done for i in $(seq 5); do getTransportInfo $TRTOK; sleep 1; done
logout logout

18
livesupport/src/modules/storageServer/var/xmlrpc/testRunner.sh
View file

@ -3,22 +3,22 @@
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Copyright (c) 2004 Media Development Loan Fund # Copyright (c) 2004 Media Development Loan Fund
# #
# This file is part of the LiveSupport project. # This file is part of the Campcaster project.
# http://livesupport.campware.org/ # http://campcaster.campware.org/
# To report bugs, send an e-mail to bugs@campware.org # To report bugs, send an e-mail to bugs@campware.org
# #
# LiveSupport is free software; you can redistribute it and/or modify # Campcaster is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or # the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. # (at your option) any later version.
# #
# LiveSupport is distributed in the hope that it will be useful, # Campcaster is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with LiveSupport; if not, write to the Free Software # along with Campcaster; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# #
@ -39,8 +39,8 @@ fi
METADATA="<?xml version=\"1.0\"?> METADATA="<?xml version=\"1.0\"?>
<audioClip> <audioClip>
<metadata <metadata
xmlns=\"http://mdlf.org/livesupport/elements/1.0/\" xmlns=\"http://mdlf.org/campcaster/elements/1.0/\"
xmlns:ls=\"http://mdlf.org/livesupport/elements/1.0/\" xmlns:ls=\"http://mdlf.org/campcaster/elements/1.0/\"
xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\"
xmlns:dcterms=\"http://purl.org/dc/terms/\" xmlns:dcterms=\"http://purl.org/dc/terms/\"
xmlns:xml=\"http://www.w3.org/XML/1998/namespace\" xmlns:xml=\"http://www.w3.org/XML/1998/namespace\"
@ -52,10 +52,10 @@ METADATA="<?xml version=\"1.0\"?>
METAREGEX="(<\\?xml version=\"1\\.0\"( encoding=\"UTF-8\")?\\?> )?\ METAREGEX="(<\\?xml version=\"1\\.0\"( encoding=\"UTF-8\")?\\?> )?\
<audioClip>\ <audioClip>\
<metadata\ <metadata\
xmlns=\"http://mdlf\\.org/livesupport/elements/1\\.0/\"\ xmlns=\"http://mdlf\\.org/campcaster/elements/1\\.0/\"\
xmlns:dc=\"http://purl\\.org/dc/elements/1\\.1/\"\ xmlns:dc=\"http://purl\\.org/dc/elements/1\\.1/\"\
xmlns:dcterms=\"http://purl\\.org/dc/terms/\"\ xmlns:dcterms=\"http://purl\\.org/dc/terms/\"\
xmlns:ls=\"http://mdlf\\.org/livesupport/elements/1\\.0/\"\ xmlns:ls=\"http://mdlf\\.org/campcaster/elements/1\\.0/\"\
xmlns:xml=\"http://www\\.w3\\.org/XML/1998/namespace\"\ xmlns:xml=\"http://www\\.w3\\.org/XML/1998/namespace\"\
>\ >\
<dc:title>Media title testRunner</dc:title>\ <dc:title>Media title testRunner</dc:title>\