EH: CS-207: Trigger category add/del as part of job add/del

Author: ernst-bablick

source/daemons/common/CMakeLists.txt

@@ -22,7 +22,6 @@
 set(LIBRARY_NAME daemonscommon)
 set(LIBRARY_SOURCES
       admin_mail.cc
-      category.cc
       err_trace.cc
       lock.cc
       mail.cc

source/daemons/common/category.cc

@@ -26,6 +26,7 @@ set(QMASTER_SOURCES
         job_report_qmaster.cc
         ocs_BaseAccountingFileWriter.cc
         ocs_BaseReportingFileWriter.cc
+        ocs_CategoryQmaster.cc
         ocs_JsonAccountingFileWriter.cc
         ocs_JsonReportingFileWriter.cc
         ocs_MirrorReaderDataStore.cc
@@ -65,7 +66,6 @@ set(QMASTER_SOURCES
         sge_reporting_qmaster.cc
         sge_resource_quota_qmaster.cc
         sge_rusage.cc
-        sge_sched_job_category.cc
         sge_sched_order.cc
         sge_sched_prepare_data.cc
         sge_sched_process_events.cc

source/daemons/qmaster/CMakeLists.txt

@@ -148,7 +148,7 @@
 #define MSG_MEM_MALLOC           _MESSAGE(33121, _("malloc failure"))
 #define MSG_SGETEXT_UNKNOWNOP    _MESSAGE(33122, _("unknown operation"))
 
-#define MSG_SGETEXT_OPNOIMPFORTARGET             _MESSAGE(33125, _("operation not implemented for target"))
+#define MSG_SGETEXT_OPNOIMPFORTARGET_S           _MESSAGE(33125, _("operation not implemented for target in " SFN))
 #define MSG_SGETEXT_NOADMINHOST_S                _MESSAGE(33126, _("denied: host " SFQ " is no admin host"))
 #define MSG_SGETEXT_NOSUBMITHOST_S               _MESSAGE(33127, _("denied: host " SFQ " is no submit host"))
 #define MSG_SGETEXT_NOSUBMITORADMINHOST_S        _MESSAGE(33128, _("denied: host " SFQ " is neither submit nor admin host"))