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

added configuration to use web-based resources for storage

Browse source
This commit is contained in:
maroy 2005-01-09 10:57:46 +00:00
parent c11f956563
commit 55f9031672
2 changed files with 121 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

25
livesupport/products/scheduler/etc/Makefile.in
View file

@ -20,8 +20,8 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# #
# Author : $Author: fgerlits $ # Author : $Author: maroy $
# Version : $Revision: 1.40 $ # Version : $Revision: 1.41 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/Makefile.in,v $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/Makefile.in,v $
# #
# @configure_input@ # @configure_input@
@ -113,6 +113,7 @@ TEST_XSLT = ../etc/testResultToHtml.xsl
SCHEDULER_EXE = ${TMP_DIR}/scheduler SCHEDULER_EXE = ${TMP_DIR}/scheduler
SCHEDULER_CFG = ${ETC_DIR}/scheduler.xml SCHEDULER_CFG = ${ETC_DIR}/scheduler.xml
SCHEDULER_WEB_CFG = ${ETC_DIR}/scheduler-web.xml
TEST_RUNNER = ${TMP_DIR}/testRunner TEST_RUNNER = ${TMP_DIR}/testRunner
DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config
@ -234,7 +235,8 @@ TEST_RUNNER_LIBS = ${SCHEDULER_EXE_LIBS} -lcppunit -ldl
# Targets # Targets
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
.PHONY: all dir_setup doc clean docclean depclean distclean .PHONY: all dir_setup doc clean docclean depclean distclean
.PHONY: install start run_tests stop uninstall .PHONY: install start status run_tests stop uninstall
.PHONY: install_web start_web status_web stop_web uninstall_web
all: dir_setup ${SCHEDULER_EXE} all: dir_setup ${SCHEDULER_EXE}
@ -290,6 +292,23 @@ run: ${SCHEDULER_EXE}
${SCHEDULER_EXE} -c ${SCHEDULER_CFG} --debug start ${SCHEDULER_EXE} -c ${SCHEDULER_CFG} --debug start
sleep 2 sleep 2
install_web: ${SCHEDULER_EXE}
${SCHEDULER_EXE} -c ${SCHEDULER_WEB_CFG} install
start_web: ${SCHEDULER_EXE}
${SCHEDULER_EXE} -c ${SCHEDULER_WEB_CFG} start
sleep 2
stop_web: ${SCHEDULER_EXE}
${SCHEDULER_EXE} -c ${SCHEDULER_WEB_CFG} stop
sleep 2
status_web: ${SCHEDULER_EXE}
${SCHEDULER_EXE} -c ${SCHEDULER_WEB_CFG} status
uninstall_web: ${SCHEDULER_EXE}
${SCHEDULER_EXE} -c ${SCHEDULER_WEB_CFG} uninstall
storage_server_init: storage_server_init:
# ${MAKE} -C ${STORAGE_SERVER_DIR} # ${MAKE} -C ${STORAGE_SERVER_DIR}

96
livesupport/products/scheduler/etc/scheduler-web.xml Normal file
View file

@ -0,0 +1,96 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE scheduler [
<!ELEMENT scheduler (connectionManagerFactory,storageClientFactory,
scheduleFactory,playLogFactory,audioPlayer,xmlRpcDaemon) >
<!ELEMENT connectionManagerFactory (simpleConnectionManager) >
<!ELEMENT simpleConnectionManager EMPTY >
<!ATTLIST simpleConnectionManager dsn CDATA #REQUIRED >
<!ATTLIST simpleConnectionManager userName CDATA #REQUIRED >
<!ATTLIST simpleConnectionManager password CDATA #REQUIRED >
<!ELEMENT storageClientFactory (testStorage|webStorage) >
<!ELEMENT testStorage (playlist*, audioClip*) >
<!ATTLIST testStorage tempFiles CDATA #REQUIRED >
<!ELEMENT webStorage (location) >
<!ATTLIST webStorage tempFiles CDATA #REQUIRED >
<!ELEMENT location EMPTY >
<!ATTLIST location server CDATA #REQUIRED >
<!ATTLIST location port NMTOKEN #REQUIRED >
<!ATTLIST location path CDATA #REQUIRED >
<!ELEMENT playlist (playlistElement*) >
<!ATTLIST playlist id NMTOKEN #REQUIRED >
<!ATTLIST playlist playlength NMTOKEN #REQUIRED >
<!ELEMENT playlistElement ((audioClip|playlist), fadeInfo?) >
<!ATTLIST playlistElement id NMTOKEN #REQUIRED >
<!ATTLIST playlistElement relativeOffset NMTOKEN #REQUIRED >
<!ELEMENT audioClip EMPTY >
<!ATTLIST audioClip id NMTOKEN #REQUIRED >
<!ATTLIST audioClip playlength NMTOKEN #REQUIRED >
<!ATTLIST audioClip title CDATA #REQUIRED >
<!ATTLIST audioClip uri CDATA #REQUIRED >
<!ELEMENT fadeInfo EMPTY >
<!ATTLIST fadeInfo id NMTOKEN #REQUIRED >
<!ATTLIST fadeInfo fadeIn NMTOKEN #REQUIRED >
<!ATTLIST fadeInfo fadeOut NMTOKEN #REQUIRED >
<!ELEMENT scheduleFactory (postgresqlSchedule) >
<!ELEMENT postgresqlSchedule EMPTY >
<!ELEMENT playLogFactory (postgresqlPlayLog) >
<!ELEMENT postgresqlPlayLog EMPTY >
<!ELEMENT audioPlayer (helixPlayer) >
<!ELEMENT helixPlayer EMPTY >
<!ATTLIST helixPlayer dllPath CDATA #REQUIRED >
<!ELEMENT xmlRpcDaemon EMPTY >
<!ATTLIST xmlRpcDaemon xmlRpcHost CDATA #REQUIRED >
<!ATTLIST xmlRpcDaemon xmlRpcPort NMTOKEN #REQUIRED >
<!ATTLIST xmlRpcDaemon pidFileName CDATA #REQUIRED >
<!ATTLIST xmlRpcDaemon background (true|false) "true" >
]>
<scheduler>
<connectionManagerFactory>
<simpleConnectionManager dsn = "LiveSupport-test"
userName = "test"
password = "test"
/>
</connectionManagerFactory>
<storageClientFactory>
<webStorage tempFiles="file:///tmp/webStorageClient" >
<location server="localhost" port="80"
path="/livesupportStorageServer/xmlrpc/xrLocStor.php" />
</webStorage>
</storageClientFactory>
<scheduleFactory>
<postgresqlSchedule/>
</scheduleFactory>
<playLogFactory>
<postgresqlPlayLog/>
</playLogFactory>
<audioPlayer>
<helixPlayer dllPath = "../../usr/lib/helix"/>
</audioPlayer>
<xmlRpcDaemon xmlRpcHost = "localhost"
xmlRpcPort = "3344"
pidFileName = "tmp/scheduler.pid"
/>
</scheduler>