references #401: revert to backwards compatible version

git-svn-id: file:///tmp/cmsos_migration/cmsos.svndb/releases/baseline8/trunk@15551 c528359e-2999-456a-ae53-7ba8edf254b3

jobcontrol/Makefile

@@ -34,9 +34,8 @@ IncludeDirs = \
 	$(XDAQ_INCLUDE_PREFIX) \
 	$(XDATA_INCLUDE_PREFIX) \
 	$(XOAP_INCLUDE_PREFIX) \
-	$(XGI_INCLUDE_PREFIX) \
-	$(XDAQ2RC_INCLUDE_PREFIX)
-	
+	$(XGI_INCLUDE_PREFIX)
+
 LibraryDirs =
 
 UserCFlags =

jobcontrol/include/jobcontrol/Application.h

@@ -63,8 +63,6 @@
 #include <sys/resource.h>
 #include <arpa/inet.h>
 
-// include for RUNControlState Notifier
-#include "xdaq2rc/RcmsStateNotifier.h"
 
 #define _jobControl_NMAX 4096
 #define _jobControl_MMAX 16
@@ -235,7 +233,6 @@ class Application : public xdaq::WebApplication,
     int             _status;         // status as defined by waitpid()
     bool            _notified;       // if a job should crash, requestor will be notified once.
     std::string     _notifierURL;    // URL of the notification requestor. 
-    std::string		_execURL;	 	// URL of xdaq executive
     std::string     _configFile;     // Configuration File of xdaq executive. 	
     std::string     _configFilePath; // Path to Configuration File of xdaq executive. 	
     char _state;                     // state as defined by /proc/[pid]/stat
@@ -258,7 +255,6 @@ class Application : public xdaq::WebApplication,
     int                    _execUid;              // user id 
     int                    _execGid;              // group id 
     std::string            _execNotifierURL;      // URL of the notification requestor. 
-    std::string			   _execURL;	 		  // URL of xdaq executive
     std::string            _execConfigFile;       // Configuration File of xdaq executive. 
     std::string            _execConfigFilePath;   // Path to configuration file of xdaq executive. 
     pid_t                  _pid;                  // PID argument for kill and check
@@ -304,7 +300,6 @@ class Application : public xdaq::WebApplication,
 
   std::string            execUser;
   std::string            execNotifierURL;
-  std::string			 execURL;
   std::string            execConfigFile;
   std::string            execConfigFilePath;
   std::list<std::string> execArgList;

jobcontrol/include/jobcontrol/version.h

@@ -19,9 +19,9 @@
 // !!! Edit this line to reflect the latest package version !!!
 
 #define JOBCONTROL_VERSION_MAJOR 1
-#define JOBCONTROL_VERSION_MINOR 14
+#define JOBCONTROL_VERSION_MINOR 13
 #define JOBCONTROL_VERSION_PATCH 0
-#define JOBCONTROL_PREVIOUS_VERSIONS "1.10.1,1.10.2,1.10.3,1.11.0,1.11.1,1.11.2,1.11.3,1.12.0,1.12.1,1.12.2,1.13"
+#define JOBCONTROL_PREVIOUS_VERSIONS "1.10.1,1.10.2,1.10.3,1.11.0,1.11.1,1.11.2,1.11.3,1.12.0,1.12.1,1.12.2"
 
 
 //

jobcontrol/src/common/Application.cc

@@ -4,7 +4,6 @@
 #include "jobcontrol/Application.h"
 #include "xdata/InfoSpaceFactory.h"
 #include "xdata/InfoSpace.h"
-
 #include "xdata/ItemGroupEvent.h"
 
 #include "jobcontrol/exception/JobCrash.h"
@@ -504,9 +503,9 @@ void jobcontrol::Application::doWatchdog ()
 	    createCrashNotificationMsg( (*iter)._jid, WIFSIGNALED(status) );
 	  try
 	    {
-	      xoap::MessageReference msg = xdaq2rc::RcmsStateNotifier::createStateNotificationMsg( 
-						  (*iter)._execURL, "RCMSStateListener", 0, "Crashed", strsignal((*iter)._status), true, 0, ::time(0), 0 );
-	      postSOAP( msg, (*iter)._notifierURL );
+	      xoap::MessageReference reply = 
+		postSOAP(soapMsg, (*iter)._notifierURL );	// send the msg
+	      LOG4CPLUS_INFO(this->getApplicationLogger(),"send notification."); 
 	    }
 	  catch(...)
 	    {
@@ -644,7 +643,6 @@ xoap::MessageReference jobcontrol::Application::startXdaqExe(xoap::MessageRefere
     std::string tmpUser        = ""; 
     std::string tmpArgv        = "";
     std::string tmpNotifierURL = "";
-    std::string tmpExecURL	   = "";
     std::string tmpConfigFile  = "";
     std::string tmpConfigFilePath  = "";
     std::string tmpTag	       = "";
@@ -695,9 +693,6 @@ xoap::MessageReference jobcontrol::Application::startXdaqExe(xoap::MessageRefere
 			else if (attributeName == "notifierURL") { // get named attributes
 			  tmpNotifierURL =  attributeValue;
 			}
-			else if (attributeName == "execURL") {
-			  tmpExecURL = attributeValue;
-			}
 			else if (attributeName == "tag") { // get named attributes
 			  tmpTag =  attributeValue;
 			} // END if get parameter
@@ -807,7 +802,6 @@ xoap::MessageReference jobcontrol::Application::startXdaqExe(xoap::MessageRefere
     ecd._execGid         = tmpGid;
     ecd._execPath        = tmpPath;
     ecd._execNotifierURL = tmpNotifierURL;
-    ecd._execURL 		 = tmpExecURL;
     ecd._execConfigFile  = tmpConfigFile;
     ecd._execConfigFilePath  = tmpConfigFilePath;
     ecd._tag		 = tmpTag;
@@ -892,7 +886,6 @@ void jobcontrol::Application::executeCommandInLoop( _ExecuteCommandData ecd  ) {
     execJid             = ecd._jid;
     execUser            = ecd._execUser;
     execNotifierURL     = ecd._execNotifierURL;
-    execURL 			= ecd._execURL;
     execConfigFile      = ecd._execConfigFile;
     execConfigFilePath  = ecd._execConfigFilePath;
     execTag		= ecd._tag;
@@ -2051,7 +2044,6 @@ void jobcontrol::Application::StartCommand()
       p._sexe            = execPath;
       p._jid             = execJid;
       p._notifierURL     = execNotifierURL;
-      p._execURL		 = execURL;
       p._configFile      = execConfigFile;
       p._configFilePath  = execConfigFilePath;
       p._tag		 = execTag;

jobcontrol/src/common/version.cc

@@ -17,7 +17,6 @@
 #include "xdaq/version.h"
 #include "xcept/version.h"
 #include "toolbox/version.h"
-#include "xdaq2rc/version.h"
 
 GETPACKAGEINFO(jobcontrol)
 
@@ -29,7 +28,6 @@ void jobcontrol::checkPackageDependencies() throw (config::PackageInfo::VersionE
 	CHECKDEPENDENCY(toolbox); 
 	CHECKDEPENDENCY(xdata);  
 	CHECKDEPENDENCY(xdaq);  
-	CHECKDEPENDENCY(xdaq2rc);
 }
 
 std::set<std::string, std::less<std::string> > jobcontrol::getPackageDependencies()
@@ -42,8 +40,7 @@ std::set<std::string, std::less<std::string> > jobcontrol::getPackageDependencie
 	ADDDEPENDENCY(dependencies,toolbox);
 	ADDDEPENDENCY(dependencies,xdata);
 	ADDDEPENDENCY(dependencies,xdaq);
-	ADDDEPENDENCY(dependencies,xdaq2rc);
-	
+	 
 	return dependencies;
 }