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

*** empty log message ***

This commit is contained in:
fgerlits 2004-11-12 14:14:23 +00:00
parent 1ce290554d
commit ca278cecdd
24 changed files with 86 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
livesupport/Makefile
View File

@ -21,7 +21,7 @@
#
#
# Author : $Author: fgerlits $
# Version : $Revision: 1.9 $
# Version : $Revision: 1.10 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/Attic/Makefile,v $
#-------------------------------------------------------------------------------
@ -48,6 +48,7 @@ COVERAGE_DIR = ${DOC_DIR}/coverage
ETC_DIR = ${BASE_DIR}/etc
DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config
XMLRPC-DOXYGEN_CONFIG = ${ETC_DIR}/xmlrpc-doxygen.config
XMLRPCXX_DOC_DIR = ${BASE_DIR}/usr/share/doc/xmlrpc++
EXTERNAL_DOC_PAGES = ${XMLRPCXX_DOC_DIR}/XmlRpcServerMethod_8h-source.html \
@ -111,6 +112,7 @@ doc: doxygen testresults
doxygen:
${DOXYGEN} ${DOXYGEN_CONFIG}
${DOXYGEN} ${XMLRPC-DOXYGEN_CONFIG}
testresults:
${XSLTPROC} ${TESTRESULT_XSLT} ${TESTRESULTS_IN} > ${TESTRESULTS_FILE}

3
livesupport/modules/storage/etc/storageClient.xml
View File

@ -4,6 +4,7 @@
<!ELEMENT storageClientFactory (testStorage) >
<!ELEMENT testStorage (playlist*) >
<!ATTLIST testStorage tempFiles CDATA #REQUIRED >
<!ELEMENT playlist (playlistElement*) >
<!ATTLIST playlist id NMTOKEN #REQUIRED >
@ -19,7 +20,7 @@
<!ATTLIST audioClip uri CDATA #REQUIRED >
]>
<storageClientFactory>
<testStorage>
<testStorage tempFiles="file:///tmp/tempPlaylist">
<playlist id="1" playlength="01:30:00.000">
<playlistElement id="101" relativeOffset="0" >
<audioClip id="10001" playlength="01:00:00.000"

3
livesupport/modules/storage/etc/testStorage.xml
View File

@ -2,6 +2,7 @@
<!DOCTYPE testStorage [
<!ELEMENT testStorage (playlist*, audioClip*) >
<!ATTLIST testStorage tempFiles CDATA #REQUIRED >
<!ELEMENT playlist (playlistElement*) >
<!ATTLIST playlist id NMTOKEN #REQUIRED >
@ -16,7 +17,7 @@
<!ATTLIST audioClip playlength NMTOKEN #REQUIRED >
<!ATTLIST audioClip uri CDATA #REQUIRED >
]>
<testStorage>
<testStorage tempFiles="file:///tmp/tempPlaylist">
<playlist id="1" playlength="01:30:00.000">
<playlistElement id="101" relativeOffset="0" >
<audioClip id="10001" playlength="01:00:00.000"

19
livesupport/modules/storage/src/TestStorageClient.cxx
View File

@ -22,7 +22,7 @@
Author : $Author: fgerlits $
Version : $Revision: 1.14 $
Version : $Revision: 1.15 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/src/TestStorageClient.cxx,v $
------------------------------------------------------------------------------*/
@ -59,6 +59,11 @@ using namespace LiveSupport::Storage;
*----------------------------------------------------------------------------*/
const std::string TestStorageClient::configElementNameStr = "testStorage";
/*------------------------------------------------------------------------------
* The name of the config element for this class
*----------------------------------------------------------------------------*/
static const std::string localTempStorageAttrName = "tempFiles";
/*------------------------------------------------------------------------------
* The XML version used to create the SMIL file.
*----------------------------------------------------------------------------*/
@ -131,6 +136,16 @@ TestStorageClient :: configure(const xmlpp::Element & element)
throw std::invalid_argument(eMsg);
}
const xmlpp::Attribute * attribute;
if (!(attribute = element.get_attribute(localTempStorageAttrName))) {
std::string eMsg = "Missing attribute ";
eMsg += localTempStorageAttrName;
throw std::invalid_argument(eMsg);
}
localTempStorage = attribute->get_value();
// iterate through the playlist elements ...
xmlpp::Node::NodeList nodes
= element.get_children(Playlist::getConfigElementName());
@ -250,7 +265,7 @@ TestStorageClient :: acquirePlaylist(Ptr<const UniqueId>::Ref id) const
}
std::stringstream fileName;
fileName << "file:///tmp/tempPlaylist" << newPlaylist->getId()->getId()
fileName << localTempStorage << newPlaylist->getId()->getId()
<< "#" << std::rand() << ".smil";
smilDocument->write_to_file(fileName.str(), "UTF-8");

14
livesupport/modules/storage/src/TestStorageClient.h
View File

@ -22,7 +22,7 @@
Author : $Author: fgerlits $
Version : $Revision: 1.12 $
Version : $Revision: 1.13 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/src/TestStorageClient.h,v $
------------------------------------------------------------------------------*/
@ -67,7 +67,7 @@ using namespace LiveSupport::Core;
* A dummy storage client, only used for test purposes.
*
* @author $Author: fgerlits $
* @version $Revision: 1.12 $
* @version $Revision: 1.13 $
*/
class TestStorageClient :
virtual public Configurable,
@ -79,11 +79,6 @@ class TestStorageClient :
*/
static const std::string configElementNameStr;
/**
* The path to the local temp storage
*/
static const std::string localTempStoragePath;
/**
* The map type containing the playlists by their ids.
*/
@ -106,6 +101,11 @@ class TestStorageClient :
*/
AudioClipMap audioClipMap;
/**
* The path where the temporary SMIL files are strored.
*/
std::string localTempStorage;
public:
/**

3
livesupport/products/scheduler/etc/scheduler.xml
View File

@ -14,6 +14,7 @@
<!ELEMENT storageClientFactory (testStorage) >
<!ELEMENT testStorage (playlist*) >
<!ATTLIST testStorage tempFiles CDATA #REQUIRED >
<!ELEMENT playlist EMPTY >
<!ATTLIST playlist id NMTOKEN #REQUIRED >
@ -44,7 +45,7 @@
</connectionManagerFactory>
<storageClientFactory>
<testStorage>
<testStorage tempFiles="file:///tmp/tempPlaylist">
<playlist id="1" playlength="01:00:00.00"/>
</testStorage>
</storageClientFactory>

3
livesupport/products/scheduler/etc/storageClient.xml
View File

@ -4,6 +4,7 @@
<!ELEMENT storageClientFactory (testStorage?) >
<!ELEMENT testStorage (playlist*, audioClip*) >
<!ATTLIST testStorage tempFiles CDATA #REQUIRED >
<!ELEMENT playlist (playlistElement*) >
<!ATTLIST playlist id NMTOKEN #REQUIRED >
@ -24,7 +25,7 @@
<!ATTLIST fadeInfo fadeOut NMTOKEN #REQUIRED >
]>
<storageClientFactory>
<testStorage>
<testStorage tempFiles="file:///tmp/tempPlaylist">
<playlist id="1" playlength="01:30:00.000">
<playlistElement id="101" relativeOffset="0" >
<audioClip id="10001" playlength="01:00:00.000"

5
livesupport/products/scheduler/src/AddAudioClipToPlaylistMethod.h
View File

@ -22,7 +22,7 @@
Author : $Author: fgerlits $
Version : $Revision: 1.4 $
Version : $Revision: 1.5 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/AddAudioClipToPlaylistMethod.h,v $
------------------------------------------------------------------------------*/
@ -69,6 +69,7 @@ using namespace LiveSupport::Core;
*
* The name of the method when called through XML-RPC is
* "addAudioClipToPlaylist".
*
* The expected parameter is an XML-RPC structure, with the following
* members:
* <ul>
@ -98,7 +99,7 @@ using namespace LiveSupport::Core;
* </ul>
*
* @author $Author: fgerlits $
* @version $Revision: 1.4 $
* @version $Revision: 1.5 $
*/
class AddAudioClipToPlaylistMethod : public XmlRpc::XmlRpcServerMethod
{

5
livesupport/products/scheduler/src/DeletePlaylistMethod.h
View File

@ -22,7 +22,7 @@
Author : $Author: fgerlits $
Version : $Revision: 1.3 $
Version : $Revision: 1.4 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/Attic/DeletePlaylistMethod.h,v $
------------------------------------------------------------------------------*/
@ -67,6 +67,7 @@ using namespace LiveSupport::Core;
* An XML-RPC method object to delete a playlist given by its playlist id.
*
* The name of the method when called through XML-RPC is "deletePlaylist".
*
* The expected parameter is an XML-RPC structure, with the following
* member:
* <ul>
@ -90,7 +91,7 @@ using namespace LiveSupport::Core;
* </ul>
*
* @author $Author: fgerlits $
* @version $Revision: 1.3 $
* @version $Revision: 1.4 $
*/
class DeletePlaylistMethod : public XmlRpc::XmlRpcServerMethod
{

5
livesupport/products/scheduler/src/DisplayAudioClipMethod.h
View File

@ -22,7 +22,7 @@
Author : $Author: fgerlits $
Version : $Revision: 1.1 $
Version : $Revision: 1.2 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/DisplayAudioClipMethod.h,v $
------------------------------------------------------------------------------*/
@ -68,6 +68,7 @@ using namespace LiveSupport::Core;
* audio clip id.
*
* The name of the method when called through XML-RPC is "displayAudioClip".
*
* The expected parameter is an XML-RPC structure, with the following
* member:
* <ul>
@ -96,7 +97,7 @@ using namespace LiveSupport::Core;
* </ul>
*
* @author $Author: fgerlits $
* @version $Revision: 1.1 $
* @version $Revision: 1.2 $
*/
class DisplayAudioClipMethod : public XmlRpc::XmlRpcServerMethod
{

5
livesupport/products/scheduler/src/DisplayAudioClipsMethod.h
View File

@ -22,7 +22,7 @@
Author : $Author: fgerlits $
Version : $Revision: 1.1 $
Version : $Revision: 1.2 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/DisplayAudioClipsMethod.h,v $
------------------------------------------------------------------------------*/
@ -71,6 +71,7 @@ using namespace LiveSupport::Core;
* in the audio clip store.
*
* The name of the method when called through XML-RPC is "displayAudioClips".
*
* No input parameters are expected.
*
* The XML-RPC function returns an XML-RPC array, containing a structure
@ -83,7 +84,7 @@ using namespace LiveSupport::Core;
* </ul>
*
* @author $Author: fgerlits $
* @version $Revision: 1.1 $
* @version $Revision: 1.2 $
*/
class DisplayAudioClipsMethod : public XmlRpc::XmlRpcServerMethod
{

5
livesupport/products/scheduler/src/DisplayPlaylistMethod.h
View File

@ -22,7 +22,7 @@
Author : $Author: fgerlits $
Version : $Revision: 1.3 $
Version : $Revision: 1.4 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/DisplayPlaylistMethod.h,v $
------------------------------------------------------------------------------*/
@ -68,6 +68,7 @@ using namespace LiveSupport::Core;
* playlist id.
*
* The name of the method when called through XML-RPC is "displayPlaylist".
*
* The expected parameter is an XML-RPC structure, with the following
* member:
* <ul>
@ -96,7 +97,7 @@ using namespace LiveSupport::Core;
* </ul>
*
* @author $Author: fgerlits $
* @version $Revision: 1.3 $
* @version $Revision: 1.4 $
*/
class DisplayPlaylistMethod : public XmlRpc::XmlRpcServerMethod
{

5
livesupport/products/scheduler/src/DisplayPlaylistsMethod.h
View File

@ -22,7 +22,7 @@
Author : $Author: fgerlits $
Version : $Revision: 1.3 $
Version : $Revision: 1.4 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/DisplayPlaylistsMethod.h,v $
------------------------------------------------------------------------------*/
@ -71,6 +71,7 @@ using namespace LiveSupport::Core;
* in the playlist store.
*
* The name of the method when called through XML-RPC is "displayPlaylists".
*
* No input parameters are expected.
*
* The XML-RPC function returns an XML-RPC array, containing a structure
@ -83,7 +84,7 @@ using namespace LiveSupport::Core;
* </ul>
*
* @author $Author: fgerlits $
* @version $Revision: 1.3 $
* @version $Revision: 1.4 $
*/
class DisplayPlaylistsMethod : public XmlRpc::XmlRpcServerMethod
{

5
livesupport/products/scheduler/src/DisplayScheduleMethod.h
View File

@ -22,7 +22,7 @@
Author : $Author: fgerlits $
Version : $Revision: 1.3 $
Version : $Revision: 1.4 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/DisplayScheduleMethod.h,v $
------------------------------------------------------------------------------*/
@ -72,6 +72,7 @@ using namespace LiveSupport::Core;
* time interval.
*
* The name of the method when called through XML-RPC is "displaySchedule".
*
* The expected parameter is an XML-RPC structure, with the following
* member:
* <ul>
@ -106,7 +107,7 @@ using namespace LiveSupport::Core;
* </ul>
*
* @author $Author: fgerlits $
* @version $Revision: 1.3 $
* @version $Revision: 1.4 $
*/
class DisplayScheduleMethod : public XmlRpc::XmlRpcServerMethod
{

5
livesupport/products/scheduler/src/GeneratePlayReportMethod.h
View File

@ -22,7 +22,7 @@
Author : $Author: fgerlits $
Version : $Revision: 1.1 $
Version : $Revision: 1.2 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/GeneratePlayReportMethod.h,v $
------------------------------------------------------------------------------*/
@ -72,6 +72,7 @@ using namespace LiveSupport::Core;
* played during a specified time interval.
*
* The name of the method when called through XML-RPC is "generatePlayReport".
*
* The expected parameter is an XML-RPC structure, with the following
* member:
* <ul>
@ -103,7 +104,7 @@ using namespace LiveSupport::Core;
* </ul>
*
* @author $Author: fgerlits $
* @version $Revision: 1.1 $
* @version $Revision: 1.2 $
*/
class GeneratePlayReportMethod : public XmlRpc::XmlRpcServerMethod
{

5
livesupport/products/scheduler/src/OpenPlaylistForEditingMethod.h
View File

@ -22,7 +22,7 @@
Author : $Author: fgerlits $
Version : $Revision: 1.5 $
Version : $Revision: 1.6 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/OpenPlaylistForEditingMethod.h,v $
------------------------------------------------------------------------------*/
@ -69,6 +69,7 @@ using namespace LiveSupport::Core;
*
* The name of the method when called through XML-RPC is
* "openPlaylistForEditing".
*
* The expected parameter is an XML-RPC structure, with the following
* member:
* <ul>
@ -96,7 +97,7 @@ using namespace LiveSupport::Core;
* <li>105 - could not open playlist </li>
* </ul>
* @author $Author: fgerlits $
* @version $Revision: 1.5 $
* @version $Revision: 1.6 $
*/
class OpenPlaylistForEditingMethod : public XmlRpc::XmlRpcServerMethod
{

5
livesupport/products/scheduler/src/RemoveAudioClipFromPlaylistMethod.h
View File

@ -22,7 +22,7 @@
Author : $Author: fgerlits $
Version : $Revision: 1.1 $
Version : $Revision: 1.2 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/RemoveAudioClipFromPlaylistMethod.h,v $
------------------------------------------------------------------------------*/
@ -69,6 +69,7 @@ using namespace LiveSupport::Core;
*
* The name of the method when called through XML-RPC is
* "removeAudioClipFromPlaylist".
*
* The expected parameter is an XML-RPC structure, with the following
* members:
* <ul>
@ -94,7 +95,7 @@ using namespace LiveSupport::Core;
* <li>406 - no audio clip at the specified relative offset </li>
* </ul>
* @author $Author: fgerlits $
* @version $Revision: 1.1 $
* @version $Revision: 1.2 $
*/
class RemoveAudioClipFromPlaylistMethod : public XmlRpc::XmlRpcServerMethod
{

5
livesupport/products/scheduler/src/RemoveFromScheduleMethod.h
View File

@ -22,7 +22,7 @@
Author : $Author: fgerlits $
Version : $Revision: 1.3 $
Version : $Revision: 1.4 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/RemoveFromScheduleMethod.h,v $
------------------------------------------------------------------------------*/
@ -68,6 +68,7 @@ using namespace LiveSupport::Core;
* An XML-RPC method object to remove a scheduled entry.
*
* The name of the method when called through XML-RPC is "removeFromSchedule".
*
* The expected parameter is an XML-RPC structure, with the following
* members:
* <ul>
@ -88,7 +89,7 @@ using namespace LiveSupport::Core;
* </ul>
*
* @author $Author: fgerlits $
* @version $Revision: 1.3 $
* @version $Revision: 1.4 $
*/
class RemoveFromScheduleMethod : public XmlRpc::XmlRpcServerMethod
{

5
livesupport/products/scheduler/src/RescheduleMethod.h
View File

@ -22,7 +22,7 @@
Author : $Author: fgerlits $
Version : $Revision: 1.3 $
Version : $Revision: 1.4 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/RescheduleMethod.h,v $
------------------------------------------------------------------------------*/
@ -68,6 +68,7 @@ using namespace LiveSupport::Core;
* An XML-RPC method object to reschedule an already scheduled event.
*
* The name of the method when called through XML-RPC is "reschedule".
*
* The expected parameter is an XML-RPC structure, with the following
* members:
* <ul>
@ -92,7 +93,7 @@ using namespace LiveSupport::Core;
* </ul>
*
* @author $Author: fgerlits $
* @version $Revision: 1.3 $
* @version $Revision: 1.4 $
*/
class RescheduleMethod : public XmlRpc::XmlRpcServerMethod
{

5
livesupport/products/scheduler/src/RevertEditedPlaylistMethod.h
View File

@ -22,7 +22,7 @@
Author : $Author: fgerlits $
Version : $Revision: 1.1 $
Version : $Revision: 1.2 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/RevertEditedPlaylistMethod.h,v $
------------------------------------------------------------------------------*/
@ -69,6 +69,7 @@ using namespace LiveSupport::Core;
*
* The name of the method when called through XML-RPC is
* "revertEditedPlaylist".
*
* The expected parameter is an XML-RPC structure, with the following
* member:
* <ul>
@ -89,7 +90,7 @@ using namespace LiveSupport::Core;
* <li>804 - could not revert playlist </li>
* </ul>
* @author $Author: fgerlits $
* @version $Revision: 1.1 $
* @version $Revision: 1.2 $
*/
class RevertEditedPlaylistMethod : public XmlRpc::XmlRpcServerMethod
{

5
livesupport/products/scheduler/src/SavePlaylistMethod.h
View File

@ -22,7 +22,7 @@
Author : $Author: fgerlits $
Version : $Revision: 1.1 $
Version : $Revision: 1.2 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/SavePlaylistMethod.h,v $
------------------------------------------------------------------------------*/
@ -70,6 +70,7 @@ using namespace LiveSupport::Core;
*
* The name of the method when called through XML-RPC is
* "savePlaylist".
*
* The expected parameter is an XML-RPC structure, with the following
* member:
* <ul>
@ -90,7 +91,7 @@ using namespace LiveSupport::Core;
* <li>704 - could not save playlist </li>
* </ul>
* @author $Author: fgerlits $
* @version $Revision: 1.1 $
* @version $Revision: 1.2 $
*/
class SavePlaylistMethod : public XmlRpc::XmlRpcServerMethod
{

5
livesupport/products/scheduler/src/UpdateFadeInFadeOutMethod.h
View File

@ -22,7 +22,7 @@
Author : $Author: fgerlits $
Version : $Revision: 1.1 $
Version : $Revision: 1.2 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/UpdateFadeInFadeOutMethod.h,v $
------------------------------------------------------------------------------*/
@ -69,6 +69,7 @@ using namespace LiveSupport::Core;
*
* The name of the method when called through XML-RPC is
* "updateFadeInFadeOut".
*
* The expected parameter is an XML-RPC structure, with the following
* members:
* <ul>
@ -98,7 +99,7 @@ using namespace LiveSupport::Core;
* <li>1608 - no audio clip at the specified relative offset </li>
* </ul>
* @author $Author: fgerlits $
* @version $Revision: 1.1 $
* @version $Revision: 1.2 $
*/
class UpdateFadeInFadeOutMethod : public XmlRpc::XmlRpcServerMethod
{

5
livesupport/products/scheduler/src/UploadPlaylistMethod.h
View File

@ -22,7 +22,7 @@
Author : $Author: fgerlits $
Version : $Revision: 1.6 $
Version : $Revision: 1.7 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/UploadPlaylistMethod.h,v $
------------------------------------------------------------------------------*/
@ -69,6 +69,7 @@ using namespace LiveSupport::Core;
* and schedule it in the scheduler.
*
* The name of the method when called through XML-RPC is "uploadPlaylist".
*
* The expected parameter is an XML-RPC structure, with the following
* members:
* <ul>
@ -101,7 +102,7 @@ using namespace LiveSupport::Core;
* </ul>
*
* @author $Author: fgerlits $
* @version $Revision: 1.6 $
* @version $Revision: 1.7 $
*/
class UploadPlaylistMethod : public XmlRpc::XmlRpcServerMethod
{

5
livesupport/products/scheduler/src/ValidatePlaylistMethod.h
View File

@ -22,7 +22,7 @@
Author : $Author: fgerlits $
Version : $Revision: 1.1 $
Version : $Revision: 1.2 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/ValidatePlaylistMethod.h,v $
------------------------------------------------------------------------------*/
@ -68,6 +68,7 @@ using namespace LiveSupport::Core;
*
* The name of the method when called through XML-RPC is
* "validatePlaylist".
*
* The expected parameter is an XML-RPC structure, with the following
* member:
* <ul>
@ -94,7 +95,7 @@ using namespace LiveSupport::Core;
* <li>504 - playlist has not been opened for editing </li>
* </ul>
* @author $Author: fgerlits $
* @version $Revision: 1.1 $
* @version $Revision: 1.2 $
*/
class ValidatePlaylistMethod : public XmlRpc::XmlRpcServerMethod
{