Task #9257: renamed ResourceAssignment/Services to...

Task #9257: renamed ResourceAssignment/Services to ResourceAssignment/RATaskSpecifiedService. Made lofar_package RATaskSpecifiedService. moved files into seperate lib/bin dir

.gitattributes

@@ -4990,6 +4990,11 @@ SAS/ResourceAssignment/QPIDInfrastructure/lib/psqlQPIDDB.py -text
 SAS/ResourceAssignment/QPIDInfrastructure/sql/CMakeLists.txt -text
 SAS/ResourceAssignment/QPIDInfrastructure/sql/qpidinfradb.sql -text
 SAS/ResourceAssignment/QPIDInfrastructure/test/test_qpid_database.sh -text
+SAS/ResourceAssignment/RATaskSpecifiedService/bin/rataskspecifiedservice -text
+SAS/ResourceAssignment/RATaskSpecifiedService/bin/rataskspecifiedservice.ini -text
+SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_correlator -text
+SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.in_preprocessing -text
+SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.sh eol=lf
 SAS/ResourceAssignment/ResourceAssignmentDatabase/CMakeLists.txt -text
 SAS/ResourceAssignment/ResourceAssignmentDatabase/__init__.py -text
 SAS/ResourceAssignment/ResourceAssignmentDatabase/config.py -text
@@ -5174,11 +5179,6 @@ SAS/ResourceAssignment/ResourceAssignmentService/test/CMakeLists.txt -text
 SAS/ResourceAssignment/ResourceAssignmentService/test/test_ra_service_and_rpc.py -text
 SAS/ResourceAssignment/ResourceAssignmentService/test/test_ra_service_and_rpc.run -text
 SAS/ResourceAssignment/ResourceAssignmentService/test/test_ra_service_and_rpc.sh -text
-SAS/ResourceAssignment/Services/src/rataskspecifiedservice -text
-SAS/ResourceAssignment/Services/src/rataskspecifiedservice.ini -text
-SAS/ResourceAssignment/Services/test/tRATaskSpecified.in_correlator -text
-SAS/ResourceAssignment/Services/test/tRATaskSpecified.in_preprocessing -text
-SAS/ResourceAssignment/Services/test/tRATaskSpecified.sh eol=lf
 SAS/ResourceAssignment/SystemStatusDatabase/CMakeLists.txt -text
 SAS/ResourceAssignment/SystemStatusDatabase/__init__.py -text
 SAS/ResourceAssignment/SystemStatusDatabase/sql/SetupDatabase.sql -text

CMake/LofarPackageList.cmake

 # - Create for each LOFAR package a variable containing the absolute path to
 # its source directory. 
 #
-# Generated by gen_LofarPackageList_cmake.sh at wo mrt 23 15:58:35 CET 2016
+# Generated by gen_LofarPackageList_cmake.sh at do mrt 24 08:54:31 CET 2016
 #
 #                      ---- DO NOT EDIT ----
 #
@@ -111,7 +111,6 @@ if(NOT DEFINED LOFAR_PACKAGE_LIST_INCLUDED)
   set(Cal_Server_SOURCE_DIR ${CMAKE_SOURCE_DIR}/MAC/APL/PAC/Cal_Server)
   set(ITRFBeamServer_SOURCE_DIR ${CMAKE_SOURCE_DIR}/MAC/APL/PAC/ITRFBeamServer)
   set(SHMInfo_Server_SOURCE_DIR ${CMAKE_SOURCE_DIR}/MAC/APL/PAC/SHMInfo_Server)
-  set(ICAL_Protocol_SOURCE_DIR ${CMAKE_SOURCE_DIR}/MAC/APL/PAC/ICAL_Protocol)
   set(RSP_Protocol_SOURCE_DIR ${CMAKE_SOURCE_DIR}/MAC/APL/PIC/RSP_Protocol)
   set(TBB_Protocol_SOURCE_DIR ${CMAKE_SOURCE_DIR}/MAC/APL/PIC/TBB_Protocol)
   set(RSP_Driver_SOURCE_DIR ${CMAKE_SOURCE_DIR}/MAC/APL/PIC/RSP_Driver)
@@ -148,7 +147,7 @@ if(NOT DEFINED LOFAR_PACKAGE_LIST_INCLUDED)
   set(jOTDB3_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTB/jOTDB3)
   set(OTB-Java_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTB/OTB)
   set(ResourceAssignmentEditor_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/ResourceAssignment/ResourceAssignmentEditor)
-  set(ResourceAssignmentServices_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/ResourceAssignment/Services)
+  set(RATaskSpecifiedService_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/ResourceAssignment/RATaskSpecifiedService)
   set(ResourceAssignmentService_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/ResourceAssignment/ResourceAssignmentService)
   set(ResourceAssignmentDatabase_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/ResourceAssignment/ResourceAssignmentDatabase)
   set(SystemStatusDatabase_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/ResourceAssignment/SystemStatusDatabase)

SAS/ResourceAssignment/CMakeLists.txt

 # $Id: CMakeLists.txt 32401 2015-09-03 13:41:57Z klijn $
 
 lofar_add_package(ResourceAssignmentEditor)
-lofar_add_package(Services)
+lofar_add_package(RATaskSpecifiedService)
 lofar_add_package(ResourceAssignmentService)
 lofar_add_package(ResourceAssignmentDatabase)
 lofar_add_package(SystemStatusDatabase)

SAS/ResourceAssignment/RATaskSpecifiedService/CMakeLists.txt

+# $Id$
+
+lofar_package(RATaskSpecifiedService 1.0 DEPENDS PyMessaging PyCommon pyparameterset OTDB_Services)
+
+include(PythonInstall)
+
+add_subdirectory(lib)
+add_subdirectory(bin)
+add_subdirectory(test)

SAS/ResourceAssignment/Services/src/rataskspecifiedservice → SAS/ResourceAssignment/RATaskSpecifiedService/bin/rataskspecifiedservice

@@ -25,7 +25,7 @@ Daemon that listens to OTDB status changes to PRESCHEDULED, requests
 the parset of such jobs (+ their predecessors), and posts them on the bus.
 """
 
-from lofar.sas.resourceassignment.RATaskSpecified import RATaskSpecified
+from lofar.sas.resourceassignment.rataskspecified.RATaskSpecified import RATaskSpecified
 
 if __name__ == "__main__":
     import sys

SAS/ResourceAssignment/RATaskSpecifiedService/lib/CMakeLists.txt

+# $Id$
+
+python_install(
+  RATaskSpecified.py
+  RABusListener.py
+  DESTINATION lofar/sas/resourceassignment/rataskspecified
+)

SAS/ResourceAssignment/Services/test/tRATaskSpecified.py → SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.py

@@ -2,7 +2,7 @@
 
 # Be able to find service python file
 import sys, os
-sys.path.insert(0, "{srcdir}/../src".format(**os.environ))
+sys.path.insert(0, "{srcdir}/../lib".format(**os.environ))
 
 from RATaskSpecified import *
 from RABusListener import RATaskSpecifiedBusListener

SAS/ResourceAssignment/Services/CMakeLists.txt

-# $Id$
-
-lofar_package(ResourceAssignmentServices 1.0 DEPENDS PyMessaging PyCommon pyparameterset OTDB_Services)
-
-include(PythonInstall)
-
-add_subdirectory(src)
-add_subdirectory(test)

SAS/ResourceAssignment/Services/src/CMakeLists.txt

-# $Id$
-
-lofar_add_bin_scripts(
-  rataskspecifiedservice
-)
-
-python_install(
-  RATaskSpecified.py
-  RABusListener.py
-  DESTINATION lofar/sas/resourceassignment
-)
-
-# supervisord config files
-install(FILES
-  rataskspecifiedservice.ini
-  DESTINATION etc/supervisord.d)

SubSystems/RAServices/CMakeLists.txt

@@ -4,7 +4,7 @@ lofar_package(RAServices
                 DEPENDS OTDB_Services
                         MoMQueryService
                         ResourceAssignmentDatabase
-                        ResourceAssignmentServices
+                        RATaskSpecifiedService
                         ResourceAssignmentEditor
                         ResourceAssignmentService)