renamed scheduler-web.xml to scheduler.xml, scheduler.xml to scheduler-local.xml
This commit is contained in:
maroy
parent
50b03c28b1
commit
bc10a650e7
3 changed files with 54 additions and 54 deletions
|
|
@ -21,7 +21,7 @@
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
# Author : $Author: maroy $
|
# 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 $
|
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/Makefile.in,v $
|
||||||
#
|
#
|
||||||
# @configure_input@
|
# @configure_input@
|
||||||
|
|
@ -117,12 +117,12 @@ TEST_RESULTS = ${DOC_DIR}/testResults.xml
|
||||||
# the text result XSLT has to be relative to the test result file, e.g. TMP_DIR
|
# the text result XSLT has to be relative to the test result file, e.g. TMP_DIR
|
||||||
TEST_XSLT = ../etc/testResultToHtml.xsl
|
TEST_XSLT = ../etc/testResultToHtml.xsl
|
||||||
|
|
||||||
SCHEDULER_EXE = ${TMP_DIR}/scheduler
|
SCHEDULER_EXE = ${TMP_DIR}/scheduler
|
||||||
SCHEDULER_SH = ${BIN_DIR}/scheduler_devenv.sh
|
SCHEDULER_SH = ${BIN_DIR}/scheduler_devenv.sh
|
||||||
SCHEDULER_CFG = ${ETC_DIR}/scheduler.xml
|
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 = ${TMP_DIR}/testRunner
|
||||||
TEST_RUNNER_SH = ${BIN_DIR}/run_tests.sh
|
TEST_RUNNER_SH = ${BIN_DIR}/run_tests.sh
|
||||||
|
|
||||||
DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config
|
DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config
|
||||||
|
|
||||||
|
|
@ -324,25 +324,25 @@ uninstall: ${SCHEDULER_EXE}
|
||||||
${SCHEDULER_SH} uninstall
|
${SCHEDULER_SH} uninstall
|
||||||
|
|
||||||
install_local: ${SCHEDULER_EXE}
|
install_local: ${SCHEDULER_EXE}
|
||||||
${SCHEDULER_EXE} -c ${SCHEDULER_CFG} install
|
${SCHEDULER_EXE} -c ${SCHEDULER_LOCAL_CFG} install
|
||||||
|
|
||||||
start_local: ${SCHEDULER_EXE}
|
start_local: ${SCHEDULER_EXE}
|
||||||
${SCHEDULER_EXE} -c ${SCHEDULER_CFG} start
|
${SCHEDULER_EXE} -c ${SCHEDULER_LOCAL_CFG} start
|
||||||
sleep 2
|
sleep 2
|
||||||
|
|
||||||
stop_local: ${SCHEDULER_EXE}
|
stop_local: ${SCHEDULER_EXE}
|
||||||
${SCHEDULER_EXE} -c ${SCHEDULER_CFG} stop
|
${SCHEDULER_EXE} -c ${SCHEDULER_LOCAL_CFG} stop
|
||||||
sleep 2
|
sleep 2
|
||||||
|
|
||||||
status_local: ${SCHEDULER_EXE}
|
status_local: ${SCHEDULER_EXE}
|
||||||
${SCHEDULER_EXE} -c ${SCHEDULER_CFG} status
|
${SCHEDULER_EXE} -c ${SCHEDULER_LOCAL_CFG} status
|
||||||
|
|
||||||
run_local: ${SCHEDULER_EXE}
|
run_local: ${SCHEDULER_EXE}
|
||||||
${SCHEDULER_EXE} -c ${SCHEDULER_CFG} --debug start
|
${SCHEDULER_EXE} -c ${SCHEDULER_LOCAL_CFG} --debug start
|
||||||
sleep 2
|
sleep 2
|
||||||
|
|
||||||
uninstall_local: ${SCHEDULER_EXE}
|
uninstall_local: ${SCHEDULER_EXE}
|
||||||
${SCHEDULER_EXE} -c ${SCHEDULER_CFG} uninstall
|
${SCHEDULER_EXE} -c ${SCHEDULER_LOCAL_CFG} uninstall
|
||||||
|
|
||||||
storage_server_init:
|
storage_server_init:
|
||||||
${MAKE} -C ${STORAGE_SERVER_DIR}
|
${MAKE} -C ${STORAGE_SERVER_DIR}
|
||||||
|
|
|
||||||
|
|
@ -34,14 +34,11 @@
|
||||||
<!ATTLIST location port NMTOKEN #REQUIRED >
|
<!ATTLIST location port NMTOKEN #REQUIRED >
|
||||||
<!ATTLIST location path CDATA #REQUIRED >
|
<!ATTLIST location path CDATA #REQUIRED >
|
||||||
|
|
||||||
<!ELEMENT storageClientFactory (testStorage|webStorage) >
|
<!ELEMENT storageClientFactory (testStorage) >
|
||||||
|
|
||||||
<!ELEMENT testStorage (playlist*, audioClip*) >
|
<!ELEMENT testStorage (playlist*, audioClip*) >
|
||||||
<!ATTLIST testStorage tempFiles CDATA #REQUIRED >
|
<!ATTLIST testStorage tempFiles CDATA #REQUIRED >
|
||||||
|
|
||||||
<!ELEMENT webStorage (location) >
|
|
||||||
<!ATTLIST webStorage tempFiles CDATA #REQUIRED >
|
|
||||||
|
|
||||||
<!ELEMENT playlist (playlistElement*) >
|
<!ELEMENT playlist (playlistElement*) >
|
||||||
<!ATTLIST playlist id NMTOKEN #REQUIRED >
|
<!ATTLIST playlist id NMTOKEN #REQUIRED >
|
||||||
<!ATTLIST playlist playlength NMTOKEN #REQUIRED >
|
<!ATTLIST playlist playlength NMTOKEN #REQUIRED >
|
||||||
|
|
@ -95,17 +92,35 @@
|
||||||
</connectionManagerFactory>
|
</connectionManagerFactory>
|
||||||
|
|
||||||
<authenticationClientFactory>
|
<authenticationClientFactory>
|
||||||
<webAuthentication>
|
<testAuthentication>
|
||||||
<location server="localhost" port="80"
|
<user login="root" password="q" />
|
||||||
path="/livesupportStorageServer/xmlrpc/xrLocStor.php" />
|
</testAuthentication>
|
||||||
</webAuthentication>
|
|
||||||
</authenticationClientFactory>
|
</authenticationClientFactory>
|
||||||
|
|
||||||
<storageClientFactory>
|
<storageClientFactory>
|
||||||
<webStorage tempFiles="file:///tmp/webStorageClient" >
|
<testStorage tempFiles="file:///tmp/tempPlaylist">
|
||||||
<location server="localhost" port="80"
|
<playlist id="0000000000000001" playlength="01:30:00.000000">
|
||||||
path="/livesupportStorageServer/xmlrpc/xrLocStor.php" />
|
<playlistElement id="0000000000000101" relativeOffset="0" >
|
||||||
</webStorage>
|
<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>
|
</storageClientFactory>
|
||||||
|
|
||||||
<scheduleFactory>
|
<scheduleFactory>
|
||||||
|
|
@ -124,7 +139,7 @@
|
||||||
xmlRpcPort = "3344"
|
xmlRpcPort = "3344"
|
||||||
pidFileName = "tmp/scheduler.pid"
|
pidFileName = "tmp/scheduler.pid"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<tagConversionTable>
|
<tagConversionTable>
|
||||||
<tag>
|
<tag>
|
||||||
<id3>Title</id3>
|
<id3>Title</id3>
|
||||||
|
|
@ -34,11 +34,14 @@
|
||||||
<!ATTLIST location port NMTOKEN #REQUIRED >
|
<!ATTLIST location port NMTOKEN #REQUIRED >
|
||||||
<!ATTLIST location path CDATA #REQUIRED >
|
<!ATTLIST location path CDATA #REQUIRED >
|
||||||
|
|
||||||
<!ELEMENT storageClientFactory (testStorage) >
|
<!ELEMENT storageClientFactory (testStorage|webStorage) >
|
||||||
|
|
||||||
<!ELEMENT testStorage (playlist*, audioClip*) >
|
<!ELEMENT testStorage (playlist*, audioClip*) >
|
||||||
<!ATTLIST testStorage tempFiles CDATA #REQUIRED >
|
<!ATTLIST testStorage tempFiles CDATA #REQUIRED >
|
||||||
|
|
||||||
|
<!ELEMENT webStorage (location) >
|
||||||
|
<!ATTLIST webStorage tempFiles CDATA #REQUIRED >
|
||||||
|
|
||||||
<!ELEMENT playlist (playlistElement*) >
|
<!ELEMENT playlist (playlistElement*) >
|
||||||
<!ATTLIST playlist id NMTOKEN #REQUIRED >
|
<!ATTLIST playlist id NMTOKEN #REQUIRED >
|
||||||
<!ATTLIST playlist playlength NMTOKEN #REQUIRED >
|
<!ATTLIST playlist playlength NMTOKEN #REQUIRED >
|
||||||
|
|
@ -92,35 +95,17 @@
|
||||||
</connectionManagerFactory>
|
</connectionManagerFactory>
|
||||||
|
|
||||||
<authenticationClientFactory>
|
<authenticationClientFactory>
|
||||||
<testAuthentication>
|
<webAuthentication>
|
||||||
<user login="root" password="q" />
|
<location server="localhost" port="80"
|
||||||
</testAuthentication>
|
path="/livesupportStorageServer/xmlrpc/xrLocStor.php" />
|
||||||
|
</webAuthentication>
|
||||||
</authenticationClientFactory>
|
</authenticationClientFactory>
|
||||||
|
|
||||||
<storageClientFactory>
|
<storageClientFactory>
|
||||||
<testStorage tempFiles="file:///tmp/tempPlaylist">
|
<webStorage tempFiles="file:///tmp/webStorageClient" >
|
||||||
<playlist id="0000000000000001" playlength="01:30:00.000000">
|
<location server="localhost" port="80"
|
||||||
<playlistElement id="0000000000000101" relativeOffset="0" >
|
path="/livesupportStorageServer/xmlrpc/xrLocStor.php" />
|
||||||
<audioClip id="0000000000010001"
|
</webStorage>
|
||||||
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>
|
</storageClientFactory>
|
||||||
|
|
||||||
<scheduleFactory>
|
<scheduleFactory>
|
||||||
|
|
@ -139,7 +124,7 @@
|
||||||
xmlRpcPort = "3344"
|
xmlRpcPort = "3344"
|
||||||
pidFileName = "tmp/scheduler.pid"
|
pidFileName = "tmp/scheduler.pid"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<tagConversionTable>
|
<tagConversionTable>
|
||||||
<tag>
|
<tag>
|
||||||
<id3>Title</id3>
|
<id3>Title</id3>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue