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

renamed scheduler-web.xml to scheduler.xml, scheduler.xml to scheduler-local.xml

Browse source
This commit is contained in:
maroy 2005-04-11 22:54:59 +00:00
parent 50b03c28b1
commit bc10a650e7
3 changed files with 54 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,7 +21,7 @@
#
#
# Author : $Author: maroy $
# Version : $Revision: 1.53 $
# Version : $Revision: 1.54 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/Makefile.in,v $
#
# @configure_input@
@ -120,7 +120,7 @@ TEST_XSLT = ../etc/testResultToHtml.xsl
SCHEDULER_EXE = ${TMP_DIR}/scheduler
SCHEDULER_SH = ${BIN_DIR}/scheduler_devenv.sh
SCHEDULER_CFG = ${ETC_DIR}/scheduler.xml
SCHEDULER_WEB_CFG = ${ETC_DIR}/scheduler-web.xml
SCHEDULER_LOCAL_CFG = ${ETC_DIR}/scheduler-local.xml
TEST_RUNNER = ${TMP_DIR}/testRunner
TEST_RUNNER_SH = ${BIN_DIR}/run_tests.sh
@ -324,25 +324,25 @@ uninstall: ${SCHEDULER_EXE}
${SCHEDULER_SH} uninstall
install_local: ${SCHEDULER_EXE}
${SCHEDULER_EXE} -c ${SCHEDULER_CFG} install
${SCHEDULER_EXE} -c ${SCHEDULER_LOCAL_CFG} install
start_local: ${SCHEDULER_EXE}
${SCHEDULER_EXE} -c ${SCHEDULER_CFG} start
${SCHEDULER_EXE} -c ${SCHEDULER_LOCAL_CFG} start
sleep 2
stop_local: ${SCHEDULER_EXE}
${SCHEDULER_EXE} -c ${SCHEDULER_CFG} stop
${SCHEDULER_EXE} -c ${SCHEDULER_LOCAL_CFG} stop
sleep 2
status_local: ${SCHEDULER_EXE}
${SCHEDULER_EXE} -c ${SCHEDULER_CFG} status
${SCHEDULER_EXE} -c ${SCHEDULER_LOCAL_CFG} status
run_local: ${SCHEDULER_EXE}
${SCHEDULER_EXE} -c ${SCHEDULER_CFG} --debug start
${SCHEDULER_EXE} -c ${SCHEDULER_LOCAL_CFG} --debug start
sleep 2
uninstall_local: ${SCHEDULER_EXE}
${SCHEDULER_EXE} -c ${SCHEDULER_CFG} uninstall
${SCHEDULER_EXE} -c ${SCHEDULER_LOCAL_CFG} uninstall
storage_server_init:
${MAKE} -C ${STORAGE_SERVER_DIR}

39
livesupport/products/scheduler/etc/scheduler-web.xml → livesupport/products/scheduler/etc/scheduler-local.xml
View file

@ -34,14 +34,11 @@
<!ATTLIST location port NMTOKEN #REQUIRED >
<!ATTLIST location path CDATA #REQUIRED >
<!ELEMENT storageClientFactory (testStorage|webStorage) >
<!ELEMENT storageClientFactory (testStorage) >
<!ELEMENT testStorage (playlist*, audioClip*) >
<!ATTLIST testStorage tempFiles CDATA #REQUIRED >
<!ELEMENT webStorage (location) >
<!ATTLIST webStorage tempFiles CDATA #REQUIRED >
<!ELEMENT playlist (playlistElement*) >
<!ATTLIST playlist id NMTOKEN #REQUIRED >
<!ATTLIST playlist playlength NMTOKEN #REQUIRED >
@ -95,17 +92,35 @@
</connectionManagerFactory>
<authenticationClientFactory>
<webAuthentication>
<location server="localhost" port="80"
path="/livesupportStorageServer/xmlrpc/xrLocStor.php" />
</webAuthentication>
<testAuthentication>
<user login="root" password="q" />
</testAuthentication>
</authenticationClientFactory>
<storageClientFactory>
<webStorage tempFiles="file:///tmp/webStorageClient" >
<location server="localhost" port="80"
path="/livesupportStorageServer/xmlrpc/xrLocStor.php" />
</webStorage>
<testStorage tempFiles="file:///tmp/tempPlaylist">
<playlist id="0000000000000001" playlength="01:30:00.000000">
<playlistElement id="0000000000000101" relativeOffset="0" >
<audioClip id="0000000000010001"
playlength="01:30:00.000000"
title="one"
uri="file:var/test1.mp3" />
</playlistElement>
<playlistElement id="0000000000000102"
relativeOffset="01:00:00.000" >
<audioClip id="0000000000010002"
playlength="00:30:00.000"
title="two"
uri="file:var/test2.mp3" />
</playlistElement>
</playlist>
<audioClip id="0000000000010001" playlength="00:00:11.000000"
title="one"
uri="file:var/test1.mp3" />
<audioClip id="0000000000010002" playlength="00:00:12.200000"
title="two"
uri="file:var/test2.mp3" />
</testStorage>
</storageClientFactory>
<scheduleFactory>

39
livesupport/products/scheduler/etc/scheduler.xml
View file

@ -34,11 +34,14 @@
<!ATTLIST location port NMTOKEN #REQUIRED >
<!ATTLIST location path CDATA #REQUIRED >
<!ELEMENT storageClientFactory (testStorage) >
<!ELEMENT storageClientFactory (testStorage|webStorage) >
<!ELEMENT testStorage (playlist*, audioClip*) >
<!ATTLIST testStorage tempFiles CDATA #REQUIRED >
<!ELEMENT webStorage (location) >
<!ATTLIST webStorage tempFiles CDATA #REQUIRED >
<!ELEMENT playlist (playlistElement*) >
<!ATTLIST playlist id NMTOKEN #REQUIRED >
<!ATTLIST playlist playlength NMTOKEN #REQUIRED >
@ -92,35 +95,17 @@
</connectionManagerFactory>
<authenticationClientFactory>
<testAuthentication>
<user login="root" password="q" />
</testAuthentication>
<webAuthentication>
<location server="localhost" port="80"
path="/livesupportStorageServer/xmlrpc/xrLocStor.php" />
</webAuthentication>
</authenticationClientFactory>
<storageClientFactory>
<testStorage tempFiles="file:///tmp/tempPlaylist">
<playlist id="0000000000000001" playlength="01:30:00.000000">
<playlistElement id="0000000000000101" relativeOffset="0" >
<audioClip id="0000000000010001"
playlength="01:30:00.000000"
title="one"
uri="file:var/test1.mp3" />
</playlistElement>
<playlistElement id="0000000000000102"
relativeOffset="01:00:00.000" >
<audioClip id="0000000000010002"
playlength="00:30:00.000"
title="two"
uri="file:var/test2.mp3" />
</playlistElement>
</playlist>
<audioClip id="0000000000010001" playlength="00:00:11.000000"
title="one"
uri="file:var/test1.mp3" />
<audioClip id="0000000000010002" playlength="00:00:12.200000"
title="two"
uri="file:var/test2.mp3" />
</testStorage>
<webStorage tempFiles="file:///tmp/webStorageClient" >
<location server="localhost" port="80"
path="/livesupportStorageServer/xmlrpc/xrLocStor.php" />
</webStorage>
</storageClientFactory>
<scheduleFactory>