diff --git a/.gitattributes b/.gitattributes index 849af24790eb3d89cda1a4542461afe86e458a5d..a37329e50f231e7901f9d9b54631cf270e36da33 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5800,46 +5800,45 @@ SAS/Specification_Services/lib/validation_service_rpc.py -text SAS/Specification_Services/test/CMakeLists.txt -text SAS/Specification_Services/test/setup_queues_and_services.sh -text SAS/Trigger_Services/CMakeLists.txt -text -SAS/Trigger_Services/TriggerReceptionService/CMakeLists.txt -text -SAS/Trigger_Services/TriggerReceptionService/__init__.py -text -SAS/Trigger_Services/TriggerReceptionService/bin/CMakeLists.txt -text -SAS/Trigger_Services/TriggerReceptionService/bin/triggerrestinterface -text -SAS/Trigger_Services/TriggerReceptionService/bin/triggerservice -text -SAS/Trigger_Services/TriggerReceptionService/django_rest/db.sqlite3 -text -SAS/Trigger_Services/TriggerReceptionService/django_rest/manage.py -text -SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/.idea/.name -text -SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/.idea/encodings.xml -text -SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/.idea/inspectionProfiles/Project_Default.xml -text -SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/.idea/inspectionProfiles/profiles_settings.xml -text -SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/.idea/misc.xml -text -SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/.idea/modules.xml -text -SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/.idea/scopes/scope_settings.xml -text -SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/.idea/triggerservice.iml -text -SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/.idea/vcs.xml -text -SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/.idea/workspace.xml -text -SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/__init__.py -text -SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/credentials.py -text -SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/settings.py -text -SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/triggerinterface/__init__.py -text -SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/triggerinterface/admin.py -text -SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/triggerinterface/apps.py -text -SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/triggerinterface/migrations/__init__.py -text -SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/triggerinterface/models.py -text -SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/triggerinterface/serializers.py -text -SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/triggerinterface/tests.py -text -SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/triggerinterface/views.py -text -SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/urls.py -text -SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/wsgi.py -text -SAS/Trigger_Services/TriggerReceptionService/django_rest/urls.py -text -SAS/Trigger_Services/TriggerReceptionService/lib/CMakeLists.txt -text -SAS/Trigger_Services/TriggerReceptionService/lib/__init__.py -text -SAS/Trigger_Services/TriggerReceptionService/lib/config.py -text -SAS/Trigger_Services/TriggerReceptionService/lib/trigger_service.py -text -SAS/Trigger_Services/TriggerReceptionService/lib/trigger_service_rpc.py -text -SAS/Trigger_Services/TriggerReceptionService/test/CMakeLists.txt -text -SAS/Trigger_Services/TriggerReceptionService/test/setup_queues_and_services.sh -text -SAS/Trigger_Services/TriggerReceptionService/test/trigger-testing.xml -text -SAS/Trigger_Services/TriggerReceptionService/test/trigger_misc_testing_nov2016.xml -text +SAS/Trigger_Services/__init__.py -text +SAS/Trigger_Services/bin/CMakeLists.txt -text +SAS/Trigger_Services/bin/triggerrestinterface -text +SAS/Trigger_Services/bin/triggerservice -text +SAS/Trigger_Services/django_rest/db.sqlite3 -text +SAS/Trigger_Services/django_rest/manage.py -text +SAS/Trigger_Services/django_rest/restinterface/.idea/.name -text +SAS/Trigger_Services/django_rest/restinterface/.idea/encodings.xml -text +SAS/Trigger_Services/django_rest/restinterface/.idea/inspectionProfiles/Project_Default.xml -text +SAS/Trigger_Services/django_rest/restinterface/.idea/inspectionProfiles/profiles_settings.xml -text +SAS/Trigger_Services/django_rest/restinterface/.idea/misc.xml -text +SAS/Trigger_Services/django_rest/restinterface/.idea/modules.xml -text +SAS/Trigger_Services/django_rest/restinterface/.idea/scopes/scope_settings.xml -text +SAS/Trigger_Services/django_rest/restinterface/.idea/triggerservice.iml -text +SAS/Trigger_Services/django_rest/restinterface/.idea/vcs.xml -text +SAS/Trigger_Services/django_rest/restinterface/.idea/workspace.xml -text +SAS/Trigger_Services/django_rest/restinterface/__init__.py -text +SAS/Trigger_Services/django_rest/restinterface/credentials.py -text +SAS/Trigger_Services/django_rest/restinterface/settings.py -text +SAS/Trigger_Services/django_rest/restinterface/triggerinterface/__init__.py -text +SAS/Trigger_Services/django_rest/restinterface/triggerinterface/admin.py -text +SAS/Trigger_Services/django_rest/restinterface/triggerinterface/apps.py -text +SAS/Trigger_Services/django_rest/restinterface/triggerinterface/migrations/__init__.py -text +SAS/Trigger_Services/django_rest/restinterface/triggerinterface/models.py -text +SAS/Trigger_Services/django_rest/restinterface/triggerinterface/serializers.py -text +SAS/Trigger_Services/django_rest/restinterface/triggerinterface/tests.py -text +SAS/Trigger_Services/django_rest/restinterface/triggerinterface/views.py -text +SAS/Trigger_Services/django_rest/restinterface/urls.py -text +SAS/Trigger_Services/django_rest/restinterface/wsgi.py -text +SAS/Trigger_Services/django_rest/urls.py -text +SAS/Trigger_Services/lib/CMakeLists.txt -text +SAS/Trigger_Services/lib/__init__.py -text +SAS/Trigger_Services/lib/config.py -text +SAS/Trigger_Services/lib/trigger_service.py -text +SAS/Trigger_Services/lib/trigger_service_rpc.py -text +SAS/Trigger_Services/test/CMakeLists.txt -text +SAS/Trigger_Services/test/setup_queues_and_services.sh -text +SAS/Trigger_Services/test/trigger-testing.xml -text +SAS/Trigger_Services/test/trigger_misc_testing_nov2016.xml -text SAS/XML_generator/CMakeLists.txt -text SAS/XML_generator/src/CMakeLists.txt -text SAS/XML_generator/src/xmlgen -text diff --git a/SAS/Trigger_Services/CMakeLists.txt b/SAS/Trigger_Services/CMakeLists.txt index 35e78fb6a128d4be003ea671e066f0c819c6fa1a..dc4f4b12f303d3152c94ba713954b332e035af69 100644 --- a/SAS/Trigger_Services/CMakeLists.txt +++ b/SAS/Trigger_Services/CMakeLists.txt @@ -1 +1,9 @@ -add_subdirectory(TriggerReceptionService) + +lofar_find_package(Python 2.7 REQUIRED) +lofar_package(sip 0.1 DEPENDS PyCommon) + +include(PythonInstall) + +add_subdirectory(lib) +add_subdirectory(bin) +add_subdirectory(test) diff --git a/SAS/Trigger_Services/TriggerReceptionService/CMakeLists.txt b/SAS/Trigger_Services/TriggerReceptionService/CMakeLists.txt deleted file mode 100644 index dc4f4b12f303d3152c94ba713954b332e035af69..0000000000000000000000000000000000000000 --- a/SAS/Trigger_Services/TriggerReceptionService/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ - -lofar_find_package(Python 2.7 REQUIRED) -lofar_package(sip 0.1 DEPENDS PyCommon) - -include(PythonInstall) - -add_subdirectory(lib) -add_subdirectory(bin) -add_subdirectory(test) diff --git a/SAS/Trigger_Services/TriggerReceptionService/__init__.py b/SAS/Trigger_Services/__init__.py similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/__init__.py rename to SAS/Trigger_Services/__init__.py diff --git a/SAS/Trigger_Services/TriggerReceptionService/bin/CMakeLists.txt b/SAS/Trigger_Services/bin/CMakeLists.txt similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/bin/CMakeLists.txt rename to SAS/Trigger_Services/bin/CMakeLists.txt diff --git a/SAS/Trigger_Services/TriggerReceptionService/bin/triggerrestinterface b/SAS/Trigger_Services/bin/triggerrestinterface similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/bin/triggerrestinterface rename to SAS/Trigger_Services/bin/triggerrestinterface diff --git a/SAS/Trigger_Services/TriggerReceptionService/bin/triggerservice b/SAS/Trigger_Services/bin/triggerservice similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/bin/triggerservice rename to SAS/Trigger_Services/bin/triggerservice diff --git a/SAS/Trigger_Services/TriggerReceptionService/django_rest/db.sqlite3 b/SAS/Trigger_Services/django_rest/db.sqlite3 similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/django_rest/db.sqlite3 rename to SAS/Trigger_Services/django_rest/db.sqlite3 diff --git a/SAS/Trigger_Services/TriggerReceptionService/django_rest/manage.py b/SAS/Trigger_Services/django_rest/manage.py similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/django_rest/manage.py rename to SAS/Trigger_Services/django_rest/manage.py diff --git a/SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/.idea/.name b/SAS/Trigger_Services/django_rest/restinterface/.idea/.name similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/.idea/.name rename to SAS/Trigger_Services/django_rest/restinterface/.idea/.name diff --git a/SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/.idea/encodings.xml b/SAS/Trigger_Services/django_rest/restinterface/.idea/encodings.xml similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/.idea/encodings.xml rename to SAS/Trigger_Services/django_rest/restinterface/.idea/encodings.xml diff --git a/SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/.idea/inspectionProfiles/Project_Default.xml b/SAS/Trigger_Services/django_rest/restinterface/.idea/inspectionProfiles/Project_Default.xml similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/.idea/inspectionProfiles/Project_Default.xml rename to SAS/Trigger_Services/django_rest/restinterface/.idea/inspectionProfiles/Project_Default.xml diff --git a/SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/.idea/inspectionProfiles/profiles_settings.xml b/SAS/Trigger_Services/django_rest/restinterface/.idea/inspectionProfiles/profiles_settings.xml similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/.idea/inspectionProfiles/profiles_settings.xml rename to SAS/Trigger_Services/django_rest/restinterface/.idea/inspectionProfiles/profiles_settings.xml diff --git a/SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/.idea/misc.xml b/SAS/Trigger_Services/django_rest/restinterface/.idea/misc.xml similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/.idea/misc.xml rename to SAS/Trigger_Services/django_rest/restinterface/.idea/misc.xml diff --git a/SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/.idea/modules.xml b/SAS/Trigger_Services/django_rest/restinterface/.idea/modules.xml similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/.idea/modules.xml rename to SAS/Trigger_Services/django_rest/restinterface/.idea/modules.xml diff --git a/SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/.idea/scopes/scope_settings.xml b/SAS/Trigger_Services/django_rest/restinterface/.idea/scopes/scope_settings.xml similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/.idea/scopes/scope_settings.xml rename to SAS/Trigger_Services/django_rest/restinterface/.idea/scopes/scope_settings.xml diff --git a/SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/.idea/triggerservice.iml b/SAS/Trigger_Services/django_rest/restinterface/.idea/triggerservice.iml similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/.idea/triggerservice.iml rename to SAS/Trigger_Services/django_rest/restinterface/.idea/triggerservice.iml diff --git a/SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/.idea/vcs.xml b/SAS/Trigger_Services/django_rest/restinterface/.idea/vcs.xml similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/.idea/vcs.xml rename to SAS/Trigger_Services/django_rest/restinterface/.idea/vcs.xml diff --git a/SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/.idea/workspace.xml b/SAS/Trigger_Services/django_rest/restinterface/.idea/workspace.xml similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/.idea/workspace.xml rename to SAS/Trigger_Services/django_rest/restinterface/.idea/workspace.xml diff --git a/SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/__init__.py b/SAS/Trigger_Services/django_rest/restinterface/__init__.py similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/__init__.py rename to SAS/Trigger_Services/django_rest/restinterface/__init__.py diff --git a/SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/credentials.py b/SAS/Trigger_Services/django_rest/restinterface/credentials.py similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/credentials.py rename to SAS/Trigger_Services/django_rest/restinterface/credentials.py diff --git a/SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/settings.py b/SAS/Trigger_Services/django_rest/restinterface/settings.py similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/settings.py rename to SAS/Trigger_Services/django_rest/restinterface/settings.py diff --git a/SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/triggerinterface/__init__.py b/SAS/Trigger_Services/django_rest/restinterface/triggerinterface/__init__.py similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/triggerinterface/__init__.py rename to SAS/Trigger_Services/django_rest/restinterface/triggerinterface/__init__.py diff --git a/SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/triggerinterface/admin.py b/SAS/Trigger_Services/django_rest/restinterface/triggerinterface/admin.py similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/triggerinterface/admin.py rename to SAS/Trigger_Services/django_rest/restinterface/triggerinterface/admin.py diff --git a/SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/triggerinterface/apps.py b/SAS/Trigger_Services/django_rest/restinterface/triggerinterface/apps.py similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/triggerinterface/apps.py rename to SAS/Trigger_Services/django_rest/restinterface/triggerinterface/apps.py diff --git a/SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/triggerinterface/migrations/__init__.py b/SAS/Trigger_Services/django_rest/restinterface/triggerinterface/migrations/__init__.py similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/triggerinterface/migrations/__init__.py rename to SAS/Trigger_Services/django_rest/restinterface/triggerinterface/migrations/__init__.py diff --git a/SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/triggerinterface/models.py b/SAS/Trigger_Services/django_rest/restinterface/triggerinterface/models.py similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/triggerinterface/models.py rename to SAS/Trigger_Services/django_rest/restinterface/triggerinterface/models.py diff --git a/SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/triggerinterface/serializers.py b/SAS/Trigger_Services/django_rest/restinterface/triggerinterface/serializers.py similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/triggerinterface/serializers.py rename to SAS/Trigger_Services/django_rest/restinterface/triggerinterface/serializers.py diff --git a/SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/triggerinterface/tests.py b/SAS/Trigger_Services/django_rest/restinterface/triggerinterface/tests.py similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/triggerinterface/tests.py rename to SAS/Trigger_Services/django_rest/restinterface/triggerinterface/tests.py diff --git a/SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/triggerinterface/views.py b/SAS/Trigger_Services/django_rest/restinterface/triggerinterface/views.py similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/triggerinterface/views.py rename to SAS/Trigger_Services/django_rest/restinterface/triggerinterface/views.py diff --git a/SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/urls.py b/SAS/Trigger_Services/django_rest/restinterface/urls.py similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/urls.py rename to SAS/Trigger_Services/django_rest/restinterface/urls.py diff --git a/SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/wsgi.py b/SAS/Trigger_Services/django_rest/restinterface/wsgi.py similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/django_rest/restinterface/wsgi.py rename to SAS/Trigger_Services/django_rest/restinterface/wsgi.py diff --git a/SAS/Trigger_Services/TriggerReceptionService/django_rest/urls.py b/SAS/Trigger_Services/django_rest/urls.py similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/django_rest/urls.py rename to SAS/Trigger_Services/django_rest/urls.py diff --git a/SAS/Trigger_Services/TriggerReceptionService/lib/CMakeLists.txt b/SAS/Trigger_Services/lib/CMakeLists.txt similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/lib/CMakeLists.txt rename to SAS/Trigger_Services/lib/CMakeLists.txt diff --git a/SAS/Trigger_Services/TriggerReceptionService/lib/__init__.py b/SAS/Trigger_Services/lib/__init__.py similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/lib/__init__.py rename to SAS/Trigger_Services/lib/__init__.py diff --git a/SAS/Trigger_Services/TriggerReceptionService/lib/config.py b/SAS/Trigger_Services/lib/config.py similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/lib/config.py rename to SAS/Trigger_Services/lib/config.py diff --git a/SAS/Trigger_Services/TriggerReceptionService/lib/trigger_service.py b/SAS/Trigger_Services/lib/trigger_service.py similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/lib/trigger_service.py rename to SAS/Trigger_Services/lib/trigger_service.py diff --git a/SAS/Trigger_Services/TriggerReceptionService/lib/trigger_service_rpc.py b/SAS/Trigger_Services/lib/trigger_service_rpc.py similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/lib/trigger_service_rpc.py rename to SAS/Trigger_Services/lib/trigger_service_rpc.py diff --git a/SAS/Trigger_Services/TriggerReceptionService/test/CMakeLists.txt b/SAS/Trigger_Services/test/CMakeLists.txt similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/test/CMakeLists.txt rename to SAS/Trigger_Services/test/CMakeLists.txt diff --git a/SAS/Trigger_Services/TriggerReceptionService/test/setup_queues_and_services.sh b/SAS/Trigger_Services/test/setup_queues_and_services.sh similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/test/setup_queues_and_services.sh rename to SAS/Trigger_Services/test/setup_queues_and_services.sh diff --git a/SAS/Trigger_Services/TriggerReceptionService/test/trigger-testing.xml b/SAS/Trigger_Services/test/trigger-testing.xml similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/test/trigger-testing.xml rename to SAS/Trigger_Services/test/trigger-testing.xml diff --git a/SAS/Trigger_Services/TriggerReceptionService/test/trigger_misc_testing_nov2016.xml b/SAS/Trigger_Services/test/trigger_misc_testing_nov2016.xml similarity index 100% rename from SAS/Trigger_Services/TriggerReceptionService/test/trigger_misc_testing_nov2016.xml rename to SAS/Trigger_Services/test/trigger_misc_testing_nov2016.xml