From ff08dedbc6ab445d1e41f33bd8898339e2bd360e Mon Sep 17 00:00:00 2001
From: fgerlits <fgerlits@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Thu, 23 Nov 2006 18:20:43 +0000
Subject: [PATCH] renamed the scheduler executable and config files to
 campcaster-scheduler; merging the rename-scheduler branch back to the trunk;
 the branch is now dead. this closes #1952

---
 campcaster/bin/postInstallStation.sh          |  2 +-
 campcaster/bin/user_setup.sh                  |  6 +++---
 campcaster/doc/install.html                   |  8 +++----
 campcaster/doc/installUbuntu.html             |  8 +++----
 campcaster/etc/Makefile.in                    |  4 ++--
 campcaster/{bin => etc}/campcaster-scheduler  |  0
 .../etc/debian/campcaster-station.conffiles   |  2 +-
 .../etc/debian/campcaster-station.postinst    |  2 +-
 .../etc/debian/campcaster-station.postrm      |  2 +-
 campcaster/etc/debian/rules                   |  8 +++----
 .../src/products/gLiveSupport/etc/Makefile.in |  4 ++--
 .../gLiveSupport/etc/campcaster-studio.xml    |  4 ++--
 .../{scheduler.sh => campcaster-scheduler.sh} |  8 +++----
 ...venv.sh => campcaster-scheduler_devenv.sh} | 20 +++++++++---------
 .../src/products/scheduler/bin/run_tests.sh   |  8 +++----
 .../src/products/scheduler/etc/Makefile.in    | 21 ++++++++++---------
 ...cal.xml => campcaster-scheduler-local.xml} |  0
 ...scheduler.xml => campcaster-scheduler.xml} |  0
 ...late => campcaster-scheduler.xml.template} |  0
 .../src/products/scheduler/etc/configure.ac   |  2 +-
 20 files changed, 54 insertions(+), 55 deletions(-)
 rename campcaster/{bin => etc}/campcaster-scheduler (100%)
 rename campcaster/src/products/scheduler/bin/{scheduler.sh => campcaster-scheduler.sh} (95%)
 rename campcaster/src/products/scheduler/bin/{scheduler_devenv.sh => campcaster-scheduler_devenv.sh} (89%)
 rename campcaster/src/products/scheduler/etc/{scheduler-local.xml => campcaster-scheduler-local.xml} (100%)
 rename campcaster/src/products/scheduler/etc/{scheduler.xml => campcaster-scheduler.xml} (100%)
 rename campcaster/src/products/scheduler/etc/{scheduler.xml.template => campcaster-scheduler.xml.template} (100%)

diff --git a/campcaster/bin/postInstallStation.sh b/campcaster/bin/postInstallStation.sh
index 9157d1b33..2e68a34fb 100755
--- a/campcaster/bin/postInstallStation.sh
+++ b/campcaster/bin/postInstallStation.sh
@@ -394,7 +394,7 @@ cd -
 
 # create scheduler-related database tables
 cd $installdir
-./bin/scheduler.sh install || exit 1;
+./bin/campcaster-scheduler.sh install || exit 1;
 cd -
 
 
diff --git a/campcaster/bin/user_setup.sh b/campcaster/bin/user_setup.sh
index e9419e138..cc6f1eedf 100755
--- a/campcaster/bin/user_setup.sh
+++ b/campcaster/bin/user_setup.sh
@@ -170,7 +170,7 @@ ls_scheduler_port=$scheduler_port
 ls_scheduler_urlPrefix=
 ls_scheduler_xmlRpcPrefix=RC2
 ls_tmp_dir=$installdir/tmp
-ls_scheduler_daemon_command="$scheduler_bin_dir/scheduler_devenv.sh"
+ls_scheduler_daemon_command="$scheduler_bin_dir/campcaster-scheduler_devenv.sh"
 
 ls_audio_output_device=$output_device
 ls_audio_cue_device=$cue_device
@@ -304,9 +304,9 @@ cat $modules_dir/storageClient/etc/webStorage.xml.template \
     | sed -e "$replace_sed_string" \
     > $configdir/webStorage.xml
 
-cat $products_dir/scheduler/etc/scheduler.xml.template \
+cat $products_dir/scheduler/etc/campcaster-scheduler.xml.template \
     | sed -e "$replace_sed_string" \
-    > $configdir/scheduler.xml
+    > $configdir/campcaster-scheduler.xml
 
 cat $products_dir/gLiveSupport/etc/campcaster-studio.xml.user-template \
     | sed -e "$replace_sed_string" \
diff --git a/campcaster/doc/install.html b/campcaster/doc/install.html
index 321f759a9..4c192e00e 100644
--- a/campcaster/doc/install.html
+++ b/campcaster/doc/install.html
@@ -129,7 +129,7 @@ After a successful installation, the Campcaster scheduler has to be
 started. The scheduler has a System V runlevel-style startup script,
 under <code>&lt;installation directory&gt;/bin/scheduler.sh<code>. 
 To start the scheduler, simply type:
-<pre><code>&lt;installation directory&gt;/bin/scheduler.sh start</code></pre>
+<pre>&lt;installation directory&gt;/bin/campcaster-scheduler.sh start</pre>
 
 <p>To use the the web interface, point your browser to
 <code>http://localhost/campcaster</code>.  You can also use the web interface
@@ -137,7 +137,7 @@ from other computers; simply put the name or IP number of the computer where
 Campcaster was installed in place of <code>localhost</code>.
 
 <p>To start Campcaster Studio, type the following:
-<pre><code>&lt;installation directory&gt;/bin/campcaster-studio.sh</code></pre>
+<pre>&lt;installation directory&gt;/bin/campcaster-studio.sh</pre>
 
 <p>For your first login, use the following values:
 <ul>
@@ -147,10 +147,10 @@ Campcaster was installed in place of <code>localhost</code>.
 Later you can change the password, and add more users, from the web interface.
 
 <p>You can make the scheduler start automatically when the system boots up, 
-by installing the &lt;installation directory&gt;/bin/campcaster-scheduler 
+by installing the &lt;installation directory&gt;/etc/campcaster-scheduler 
 init script.  In Debian-based systems, this is done by 
 typing 
-<pre>cp &lt;installation directory&gt;/bin/campcaster-scheduler /etc/init.d/
+<pre>cp &lt;installation directory&gt;/etc/campcaster-scheduler /etc/init.d/
 update-rc.d campcaster-scheduler defaults 92
 </pre>
 as root.  Note: in the init script, the variable <code>CAMPCASTER_DIR</code> 
diff --git a/campcaster/doc/installUbuntu.html b/campcaster/doc/installUbuntu.html
index 6fa4f134a..44d7b2565 100644
--- a/campcaster/doc/installUbuntu.html
+++ b/campcaster/doc/installUbuntu.html
@@ -69,10 +69,8 @@ and the database that Campcaster uses to store its data.  Type the following:
 
 <h2>5. Start Campcaster</h2>
 After a successful installation, the Campcaster scheduler has to be
-started. The scheduler has a System V runlevel-style startup script,
-under <code>/opt/campcaster/bin/scheduler.sh<code>. To start the scheduler,
-simply type:
-<pre>/opt/campcaster/bin/scheduler.sh start</pre>
+started, by typing:
+<pre>/opt/campcaster/bin/campcaster-scheduler.sh start</pre>
 
 <p>To use the the web interface, point your browser to
 <code>http://localhost/campcaster</code>.  You can also use the web interface
@@ -91,7 +89,7 @@ Later you can change the password, and add more users, from the web interface.
 
 <p>You can make the scheduler start automatically when the system boots up, 
 by doing the following:
-<pre>sudo cp /opt/livesupport/bin/campcaster-scheduler /etc/init.d/
+<pre>sudo cp /opt/livesupport/etc/campcaster-scheduler /etc/init.d/
 sudo update-rc.d campcaster-scheduler defaults 92
 </pre>
 
diff --git a/campcaster/etc/Makefile.in b/campcaster/etc/Makefile.in
index 6aa1f2899..ff6fe3f1a 100644
--- a/campcaster/etc/Makefile.in
+++ b/campcaster/etc/Makefile.in
@@ -133,7 +133,7 @@ PRODUCTS_DIR     = ${SRC_DIR}/products
 SCHEDULER_DIR    = ${PRODUCTS_DIR}/scheduler
 GLIVESUPPORT_DIR = ${PRODUCTS_DIR}/gLiveSupport
 
-SCHEDULER_EXE    = ${SCHEDULER_DIR}/tmp/scheduler
+SCHEDULER_EXE    = ${SCHEDULER_DIR}/tmp/campcaster-scheduler
 GLIVESUPPORT_EXE = ${GLIVESUPPORT_DIR}/tmp/campcaster-studio
 
 #-------------------------------------------------------------------------------
@@ -405,7 +405,7 @@ install: setup compile setup_install_dirs create_database install_modules instal
 	${CP} ${ETC_DIR}/apache/*.conf ${USR_ETC_DIR}/apache
 	${MKDIR} ${USR_BIN_DIR}
 	${CP} ${BIN_DIR}/postInstallStation.sh ${USR_BIN_DIR}
-	${CP} ${BIN_DIR}/campcaster-scheduler ${USR_BIN_DIR}
+	${CP} ${ETC_DIR}/campcaster-scheduler ${USR_ETC_DIR}
 	${CP} ${ETC_DIR}/pg_hba.conf ${USR_ETC_DIR}
 
 create_database:
diff --git a/campcaster/bin/campcaster-scheduler b/campcaster/etc/campcaster-scheduler
similarity index 100%
rename from campcaster/bin/campcaster-scheduler
rename to campcaster/etc/campcaster-scheduler
diff --git a/campcaster/etc/debian/campcaster-station.conffiles b/campcaster/etc/debian/campcaster-station.conffiles
index 2f4e031f8..fff04381b 100644
--- a/campcaster/etc/debian/campcaster-station.conffiles
+++ b/campcaster/etc/debian/campcaster-station.conffiles
@@ -1,3 +1,3 @@
 /opt/campcaster/var/Campcaster/storageServer/var/conf.php
 /opt/campcaster/var/Campcaster/archiveServer/var/conf.php
-/opt/campcaster/etc/scheduler.xml
+/opt/campcaster/etc/campcaster-scheduler.xml
diff --git a/campcaster/etc/debian/campcaster-station.postinst b/campcaster/etc/debian/campcaster-station.postinst
index a2989cb17..f78e6d0ab 100644
--- a/campcaster/etc/debian/campcaster-station.postinst
+++ b/campcaster/etc/debian/campcaster-station.postinst
@@ -28,7 +28,7 @@ case "$1" in
                         --postgresql-init-script=/etc/init.d/postgresql-8.1
 
         # register and start the livesupport scheduler daemon
-        cp -f $installdir/bin/campcaster-scheduler /etc/init.d
+        cp -f $installdir/etc/campcaster-scheduler /etc/init.d
         update-rc.d campcaster-scheduler defaults 92 || true
         /etc/init.d/campcaster-scheduler start || true
     ;;
diff --git a/campcaster/etc/debian/campcaster-station.postrm b/campcaster/etc/debian/campcaster-station.postrm
index 4512a602c..edf2f8417 100644
--- a/campcaster/etc/debian/campcaster-station.postrm
+++ b/campcaster/etc/debian/campcaster-station.postrm
@@ -74,7 +74,7 @@ case "$1" in
 
             echo "Deleting data files...";
 
-            rm -rf $installdir/etc/scheduler.xml
+            rm -rf $installdir/etc/campcaster-scheduler.xml
             rm -rf $installdir/etc/gst-registry.xml
             rm -rf $installdir/etc/pear.conf
             rm -rf $installdir/var/Campcaster/htmlUI/var/html/img/*
diff --git a/campcaster/etc/debian/rules b/campcaster/etc/debian/rules
index 12f04f011..644411645 100755
--- a/campcaster/etc/debian/rules
+++ b/campcaster/etc/debian/rules
@@ -92,14 +92,13 @@ install-arch:
 	mkdir -p $(CURDIR)/debian/campcaster-station/opt/campcaster/tmp
 	mkdir -p $(CURDIR)/debian/campcaster-station/opt/campcaster/var/Campcaster
 	mkdir -p $(CURDIR)/debian/campcaster-station/opt/campcaster/usr/lib
-	mv -f $(CURDIR)/debian/campcaster/opt/campcaster/bin/scheduler \
-	      $(CURDIR)/debian/campcaster/opt/campcaster/bin/scheduler.sh \
+	mv -f $(CURDIR)/debian/campcaster/opt/campcaster/bin/campcaster-scheduler \
+	      $(CURDIR)/debian/campcaster/opt/campcaster/bin/campcaster-scheduler.sh \
 	      $(CURDIR)/debian/campcaster/opt/campcaster/bin/postInstallStation.sh \
-	      $(CURDIR)/debian/campcaster/opt/campcaster/bin/campcaster-scheduler \
 	      $(CURDIR)/debian/campcaster/opt/campcaster/bin/createDatabase.sh \
 	      $(CURDIR)/debian/campcaster/opt/campcaster/bin/createOdbcDataSource.sh \
 		      $(CURDIR)/debian/campcaster-station/opt/campcaster/bin
-	mv -f $(CURDIR)/debian/campcaster/opt/campcaster/etc/scheduler.xml* \
+	mv -f $(CURDIR)/debian/campcaster/opt/campcaster/etc/campcaster-scheduler.xml* \
 	      $(CURDIR)/debian/campcaster/opt/campcaster/etc/odbc* \
 		      $(CURDIR)/debian/campcaster-station/opt/campcaster/etc
 	mv -f $(CURDIR)/debian/campcaster/opt/campcaster/var/Campcaster/alib \
@@ -119,6 +118,7 @@ install-arch:
               $(CURDIR)/debian/campcaster-station/opt/campcaster/var
 	mv -f $(CURDIR)/debian/campcaster/opt/campcaster/etc/apache \
 	      $(CURDIR)/debian/campcaster/opt/campcaster/etc/pg_hba.conf \
+	      $(CURDIR)/debian/campcaster/opt/campcaster/etc/campcaster-scheduler \
               $(CURDIR)/debian/campcaster-station/opt/campcaster/etc
 
 	# now separate the studio (client) files into debian/campcaster-studio
diff --git a/campcaster/src/products/gLiveSupport/etc/Makefile.in b/campcaster/src/products/gLiveSupport/etc/Makefile.in
index 6bf178205..ad3a5b04f 100644
--- a/campcaster/src/products/gLiveSupport/etc/Makefile.in
+++ b/campcaster/src/products/gLiveSupport/etc/Makefile.in
@@ -81,7 +81,7 @@ AUDIO_CUE      = "@AUDIO_CUE@"
 PHP_URL_PREFIX=campcaster
 ALIB_XML_RPC_PREFIX=xmlrpc/xrLocStor.php
 SCHEDULER_XML_RPC_PREFIX=RC2
-SCHEDULER_DAEMON_COMMAND="sudo ${USR_BIN_DIR}/scheduler.sh"
+SCHEDULER_DAEMON_COMMAND="sudo ${USR_BIN_DIR}/campcaster-scheduler.sh"
 
 USR_VAR_DIR_S=$(shell ${ECHO} ${USR_VAR_DIR} | ${SED} -e "s/\//\\\\\\\\\//g")
 PHP_URL_PREFIX_S=$(shell ${ECHO} ${PHP_URL_PREFIX} | \
@@ -127,7 +127,7 @@ PRODUCTS_DIR     = ${BASE_DIR}/../../products
 STORAGE_SERVER_DIR = ${MODULES_DIR}/storageServer
 
 SCHEDULER_DIR    = ${PRODUCTS_DIR}/scheduler
-SCHEDULER_EXE    = ${SCHEDULER_DIR}/tmp/scheduler
+SCHEDULER_EXE    = ${SCHEDULER_DIR}/tmp/campcaster-scheduler
 
 CORE_DIR         = ${MODULES_DIR}/core
 CORE_INCLUDE_DIR = ${CORE_DIR}/include
diff --git a/campcaster/src/products/gLiveSupport/etc/campcaster-studio.xml b/campcaster/src/products/gLiveSupport/etc/campcaster-studio.xml
index 3eb144b97..43bb4c646 100644
--- a/campcaster/src/products/gLiveSupport/etc/campcaster-studio.xml
+++ b/campcaster/src/products/gLiveSupport/etc/campcaster-studio.xml
@@ -157,8 +157,8 @@
     </schedulerClientFactory>
 
     <schedulerDaemonCommands
-                    start = "../scheduler/bin/scheduler_devenv.sh start"
-                    stop  = "../scheduler/bin/scheduler_devenv.sh stop" />
+            start = "../scheduler/bin/campcaster-scheduler_devenv.sh start"
+            stop  = "../scheduler/bin/campcaster-scheduler_devenv.sh stop" />
 
     <outputPlayer>
         <audioPlayer>
diff --git a/campcaster/src/products/scheduler/bin/scheduler.sh b/campcaster/src/products/scheduler/bin/campcaster-scheduler.sh
similarity index 95%
rename from campcaster/src/products/scheduler/bin/scheduler.sh
rename to campcaster/src/products/scheduler/bin/campcaster-scheduler.sh
index 18cd70a2d..271e6068c 100755
--- a/campcaster/src/products/scheduler/bin/scheduler.sh
+++ b/campcaster/src/products/scheduler/bin/campcaster-scheduler.sh
@@ -46,8 +46,8 @@ libdir=$basedir/lib
 gstreamer_dir=`find $libdir -type d -name "gstreamer-*"`
 
 export LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH
-scheduler_exe=$bindir/scheduler
-config_file=$etcdir/scheduler.xml
+scheduler_exe=$bindir/campcaster-scheduler
+config_file=$etcdir/campcaster-scheduler.xml
 
 mode=$1
 
@@ -94,9 +94,9 @@ case "$mode" in
 
     'kill')
         echo "Killing all Campcaster scheduler processes..."
-        killall scheduler
+        killall campcaster-scheduler
         sleep 2
-        killall -9 scheduler
+        killall -9 campcaster-scheduler
         ;;
 
     *)
diff --git a/campcaster/src/products/scheduler/bin/scheduler_devenv.sh b/campcaster/src/products/scheduler/bin/campcaster-scheduler_devenv.sh
similarity index 89%
rename from campcaster/src/products/scheduler/bin/scheduler_devenv.sh
rename to campcaster/src/products/scheduler/bin/campcaster-scheduler_devenv.sh
index 9d5168497..140a8f516 100755
--- a/campcaster/src/products/scheduler/bin/scheduler_devenv.sh
+++ b/campcaster/src/products/scheduler/bin/campcaster-scheduler_devenv.sh
@@ -49,18 +49,18 @@ usrdir=`cd $basedir/../../../usr; pwd;`
 #-------------------------------------------------------------------------------
 export LD_LIBRARY_PATH=$usrdir/lib:$LD_LIBRARY_PATH
 
-if [ -x $bindir/scheduler ]; then
-    scheduler_exe=$bindir/scheduler
-elif [ -x $tmpdir/scheduler ]; then
-    scheduler_exe=$tmpdir/scheduler
+if [ -x $bindir/campcaster-scheduler ]; then
+    scheduler_exe=$bindir/campcaster-scheduler
+elif [ -x $tmpdir/campcaster-scheduler ]; then
+    scheduler_exe=$tmpdir/campcaster-scheduler
 else
     echo "Can't find scheduler executable.";
 fi
 
-if [ -f ~/.campcaster/scheduler.xml ]; then
-    config_file=~/.campcaster/scheduler.xml
-elif [ -f $etcdir/scheduler.xml ]; then
-    config_file=$etcdir/scheduler.xml
+if [ -f ~/.campcaster/campcaster-scheduler.xml ]; then
+    config_file=~/.campcaster/campcaster-scheduler.xml
+elif [ -f $etcdir/campcaster-scheduler.xml ]; then
+    config_file=$etcdir/campcaster-scheduler.xml
 else
     echo "Can't find configuration file.";
 fi
@@ -119,9 +119,9 @@ case "$mode" in
 
     'kill')
         echo "Killing all Campcaster scheduler processes..."
-        killall scheduler
+        killall campcaster-scheduler
         sleep 2
-        killall -9 scheduler
+        killall -9 campcaster-scheduler
         ;;
 
     *)
diff --git a/campcaster/src/products/scheduler/bin/run_tests.sh b/campcaster/src/products/scheduler/bin/run_tests.sh
index eef4562ad..2255e1306 100755
--- a/campcaster/src/products/scheduler/bin/run_tests.sh
+++ b/campcaster/src/products/scheduler/bin/run_tests.sh
@@ -54,10 +54,10 @@ else
     echo "Can't find testRunner executable.";
 fi
 
-if [ -f ~/.campcaster/scheduler.xml ]; then
-    config_file=~/.campcaster/scheduler.xml
-elif [ -f $etcdir/scheduler.xml ]; then
-    config_file=$etcdir/scheduler.xml
+if [ -f ~/.campcaster/campcaster-scheduler.xml ]; then
+    config_file=~/.campcaster/campcaster-scheduler.xml
+elif [ -f $etcdir/campcaster-scheduler.xml ]; then
+    config_file=$etcdir/campcaster-scheduler.xml
 else
     echo "Can't find configuration file.";
 fi
diff --git a/campcaster/src/products/scheduler/etc/Makefile.in b/campcaster/src/products/scheduler/etc/Makefile.in
index 14132e99c..aec4b2a23 100644
--- a/campcaster/src/products/scheduler/etc/Makefile.in
+++ b/campcaster/src/products/scheduler/etc/Makefile.in
@@ -180,10 +180,10 @@ TEST_RESULTS = ${DOC_DIR}/testResults.xml
 # the text result XSLT has to be relative to the test result file, e.g. TMP_DIR
 TEST_XSLT    = ../etc/testResultToHtml.xsl
 
-SCHEDULER_EXE       = ${TMP_DIR}/scheduler
-SCHEDULER_SH        = ${BIN_DIR}/scheduler_devenv.sh
-SCHEDULER_CFG       = ${ETC_DIR}/scheduler.xml
-SCHEDULER_LOCAL_CFG = ${ETC_DIR}/scheduler-local.xml
+SCHEDULER_EXE       = ${TMP_DIR}/campcaster-scheduler
+SCHEDULER_SH        = ${BIN_DIR}/campcaster-scheduler_devenv.sh
+SCHEDULER_CFG       = ${ETC_DIR}/campcaster-scheduler.xml
+SCHEDULER_LOCAL_CFG = ${ETC_DIR}/campcaster-scheduler-local.xml
 TEST_RUNNER         = ${TMP_DIR}/testRunner
 TEST_RUNNER_SH      = ${BIN_DIR}/run_tests.sh
 
@@ -355,7 +355,7 @@ copy_files:
 	${MKDIR} ${USR_BIN_DIR}
 	${MKDIR} ${USR_ETC_DIR}
 	${MKDIR} ${USR_TMP_DIR}
-	${CP} ${BIN_DIR}/scheduler.sh ${USR_BIN_DIR}
+	${CP} ${BIN_DIR}/campcaster-scheduler.sh ${USR_BIN_DIR}
 	${CP} ${SCHEDULER_EXE} ${USR_BIN_DIR}
 	${CP} ${ETC_DIR}/odbcinst_old_debian_template \
 	      ${ETC_DIR}/odbcinst_new_debian_template \
@@ -364,8 +364,9 @@ copy_files:
 	      ${BIN_DIR}/createOdbcDataSource.sh ${USR_BIN_DIR}
 	${CAT} ${ETC_DIR}/odbc_template | ${SED} -e ${REPLACE_SED_STRING} \
 	       > ${USR_ETC_DIR}/odbc_template
-	${CAT} ${ETC_DIR}/scheduler.xml.template | ${SED} -e ${REPLACE_SED_STRING} \
-	       > ${USR_ETC_DIR}/scheduler.xml
+	${CAT} ${ETC_DIR}/campcaster-scheduler.xml.template \
+	       | ${SED} -e ${REPLACE_SED_STRING} \
+	       > ${USR_ETC_DIR}/campcaster-scheduler.xml
 
 create_database:
 ifeq (@CREATE_LS_DATABASE@,yes)
@@ -383,7 +384,7 @@ endif
 
 init_database:
 ifeq (@INIT_LS_DATABASE@,yes)
-	${USR_BIN_DIR}/scheduler.sh install
+	${USR_BIN_DIR}/campcaster-scheduler.sh install
 endif
 
 
@@ -437,9 +438,9 @@ storage_server_init:
 	${MAKE} -C ${STORAGE_SERVER_DIR}
 
 kill:
-	${KILLALL} scheduler || true
+	${KILLALL} campcaster-scheduler || true
 	sleep 2
-	${KILLALL} -9 scheduler || true
+	${KILLALL} -9 campcaster-scheduler || true
 
 
 #-------------------------------------------------------------------------------
diff --git a/campcaster/src/products/scheduler/etc/scheduler-local.xml b/campcaster/src/products/scheduler/etc/campcaster-scheduler-local.xml
similarity index 100%
rename from campcaster/src/products/scheduler/etc/scheduler-local.xml
rename to campcaster/src/products/scheduler/etc/campcaster-scheduler-local.xml
diff --git a/campcaster/src/products/scheduler/etc/scheduler.xml b/campcaster/src/products/scheduler/etc/campcaster-scheduler.xml
similarity index 100%
rename from campcaster/src/products/scheduler/etc/scheduler.xml
rename to campcaster/src/products/scheduler/etc/campcaster-scheduler.xml
diff --git a/campcaster/src/products/scheduler/etc/scheduler.xml.template b/campcaster/src/products/scheduler/etc/campcaster-scheduler.xml.template
similarity index 100%
rename from campcaster/src/products/scheduler/etc/scheduler.xml.template
rename to campcaster/src/products/scheduler/etc/campcaster-scheduler.xml.template
diff --git a/campcaster/src/products/scheduler/etc/configure.ac b/campcaster/src/products/scheduler/etc/configure.ac
index 9c39eafad..43fdb5f8a 100644
--- a/campcaster/src/products/scheduler/etc/configure.ac
+++ b/campcaster/src/products/scheduler/etc/configure.ac
@@ -32,7 +32,7 @@ dnl This is due to the fact that configure spreads a lot of trash around,
 dnl like atom4te cache directories, config.* files, etc. into the directory
 dnl it is being run from. We clearly don't want these in our base directory.
 dnl-----------------------------------------------------------------------------
-AC_INIT(Scheduler, 1.1.0, bugs@campware.org)
+AC_INIT(Campcaster-Scheduler, 1.1.0, bugs@campware.org)
 AC_PREREQ(2.59)
 AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL])
 AC_REVISION($Revision$)