diff --git a/.gitattributes b/.gitattributes index a5688996dcb2149340999748de2b46631196a791..5adb36f3bf6b55a1d24d4c400842e262f7f4b096 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5852,82 +5852,82 @@ SAS/Scheduler/test/unittest/testGui/testGui.sh eol=lf SAS/Scheduler/test/unittest/testqstring/testqstring.run eol=lf SAS/Scheduler/test/unittest/testqstring/testqstring.sh eol=lf SAS/Scheduler/test/unittest/tojunit.xslt -text -SAS/Specification_Services/CMakeLists.txt -text -SAS/Specification_Services/bin/CMakeLists.txt -text -SAS/Specification_Services/bin/specificationservice -text -SAS/Specification_Services/bin/specificationservice.ini -text -SAS/Specification_Services/bin/specificationtranslationservice -text -SAS/Specification_Services/bin/specificationtranslationservice.ini -text -SAS/Specification_Services/bin/specificationvalidationservice -text -SAS/Specification_Services/bin/specificationvalidationservice.ini -text -SAS/Specification_Services/lib/CMakeLists.txt -text -SAS/Specification_Services/lib/__init__.py -text -SAS/Specification_Services/lib/config.py -text -SAS/Specification_Services/lib/specification_service.py -text -SAS/Specification_Services/lib/specification_service_rpc.py -text -SAS/Specification_Services/lib/translation_service.py -text -SAS/Specification_Services/lib/translation_service_rpc.py -text -SAS/Specification_Services/lib/validation_service.py -text -SAS/Specification_Services/lib/validation_service_rpc.py -text -SAS/Specification_Services/test/CMakeLists.txt -text -SAS/Specification_Services/test/frombus.py -text -SAS/Specification_Services/xsd/CMakeLists.txt -text -SAS/Specification_Services/xsd/LofarBase.xsd -text -SAS/Specification_Services/xsd/LofarHistorical.xsd -text -SAS/Specification_Services/xsd/LofarMoM2.xsd -text -SAS/Specification_Services/xsd/LofarProject.xsd -text -SAS/Specification_Services/xsd/LofarSpecification.xsd -text -SAS/Specification_Services/xsd/LofarTrigger.xsd -text -SAS/Specification_Services/xsd/MoM2.xsd -text -SAS/Specification_Services/xsd/PersistentObjects.xsd -text -SAS/Specification_Services/xsd/UserAdmin.xsd -text -SAS/Trigger_Services/CMakeLists.txt -text -SAS/Trigger_Services/__init__.py -text -SAS/Trigger_Services/bin/CMakeLists.txt -text -SAS/Trigger_Services/bin/triggerrestinterface -text -SAS/Trigger_Services/bin/triggerrestinterface.ini -text -SAS/Trigger_Services/bin/triggerservice -text -SAS/Trigger_Services/bin/triggerservice.ini -text -SAS/Trigger_Services/django_rest/CMakeLists.txt -text -SAS/Trigger_Services/django_rest/db.sqlite3 -text -SAS/Trigger_Services/django_rest/manage.py -text -SAS/Trigger_Services/django_rest/readme.txt -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/CMakeLists.txt -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/CMakeLists.txt -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/config.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/SpecificationServices/CMakeLists.txt -text +SAS/SpecificationServices/bin/CMakeLists.txt -text +SAS/SpecificationServices/bin/specificationservice -text +SAS/SpecificationServices/bin/specificationservice.ini -text +SAS/SpecificationServices/bin/specificationtranslationservice -text +SAS/SpecificationServices/bin/specificationtranslationservice.ini -text +SAS/SpecificationServices/bin/specificationvalidationservice -text +SAS/SpecificationServices/bin/specificationvalidationservice.ini -text +SAS/SpecificationServices/lib/CMakeLists.txt -text +SAS/SpecificationServices/lib/__init__.py -text +SAS/SpecificationServices/lib/config.py -text +SAS/SpecificationServices/lib/specification_service.py -text +SAS/SpecificationServices/lib/specification_service_rpc.py -text +SAS/SpecificationServices/lib/translation_service.py -text +SAS/SpecificationServices/lib/translation_service_rpc.py -text +SAS/SpecificationServices/lib/validation_service.py -text +SAS/SpecificationServices/lib/validation_service_rpc.py -text +SAS/SpecificationServices/test/CMakeLists.txt -text +SAS/SpecificationServices/test/frombus.py -text +SAS/SpecificationServices/xsd/CMakeLists.txt -text +SAS/SpecificationServices/xsd/LofarBase.xsd -text +SAS/SpecificationServices/xsd/LofarHistorical.xsd -text +SAS/SpecificationServices/xsd/LofarMoM2.xsd -text +SAS/SpecificationServices/xsd/LofarProject.xsd -text +SAS/SpecificationServices/xsd/LofarSpecification.xsd -text +SAS/SpecificationServices/xsd/LofarTrigger.xsd -text +SAS/SpecificationServices/xsd/MoM2.xsd -text +SAS/SpecificationServices/xsd/PersistentObjects.xsd -text +SAS/SpecificationServices/xsd/UserAdmin.xsd -text +SAS/TriggerServices/CMakeLists.txt -text +SAS/TriggerServices/__init__.py -text +SAS/TriggerServices/bin/CMakeLists.txt -text +SAS/TriggerServices/bin/triggerrestinterface -text +SAS/TriggerServices/bin/triggerrestinterface.ini -text +SAS/TriggerServices/bin/triggerservice -text +SAS/TriggerServices/bin/triggerservice.ini -text +SAS/TriggerServices/django_rest/CMakeLists.txt -text +SAS/TriggerServices/django_rest/db.sqlite3 -text +SAS/TriggerServices/django_rest/manage.py -text +SAS/TriggerServices/django_rest/readme.txt -text +SAS/TriggerServices/django_rest/restinterface/.idea/.name -text +SAS/TriggerServices/django_rest/restinterface/.idea/encodings.xml -text +SAS/TriggerServices/django_rest/restinterface/.idea/inspectionProfiles/Project_Default.xml -text +SAS/TriggerServices/django_rest/restinterface/.idea/inspectionProfiles/profiles_settings.xml -text +SAS/TriggerServices/django_rest/restinterface/.idea/misc.xml -text +SAS/TriggerServices/django_rest/restinterface/.idea/modules.xml -text +SAS/TriggerServices/django_rest/restinterface/.idea/scopes/scope_settings.xml -text +SAS/TriggerServices/django_rest/restinterface/.idea/triggerservice.iml -text +SAS/TriggerServices/django_rest/restinterface/.idea/vcs.xml -text +SAS/TriggerServices/django_rest/restinterface/.idea/workspace.xml -text +SAS/TriggerServices/django_rest/restinterface/CMakeLists.txt -text +SAS/TriggerServices/django_rest/restinterface/__init__.py -text +SAS/TriggerServices/django_rest/restinterface/credentials.py -text +SAS/TriggerServices/django_rest/restinterface/settings.py -text +SAS/TriggerServices/django_rest/restinterface/triggerinterface/CMakeLists.txt -text +SAS/TriggerServices/django_rest/restinterface/triggerinterface/__init__.py -text +SAS/TriggerServices/django_rest/restinterface/triggerinterface/admin.py -text +SAS/TriggerServices/django_rest/restinterface/triggerinterface/apps.py -text +SAS/TriggerServices/django_rest/restinterface/triggerinterface/config.py -text +SAS/TriggerServices/django_rest/restinterface/triggerinterface/migrations/__init__.py -text +SAS/TriggerServices/django_rest/restinterface/triggerinterface/models.py -text +SAS/TriggerServices/django_rest/restinterface/triggerinterface/serializers.py -text +SAS/TriggerServices/django_rest/restinterface/triggerinterface/tests.py -text +SAS/TriggerServices/django_rest/restinterface/triggerinterface/views.py -text +SAS/TriggerServices/django_rest/restinterface/urls.py -text +SAS/TriggerServices/django_rest/restinterface/wsgi.py -text +SAS/TriggerServices/django_rest/urls.py -text +SAS/TriggerServices/lib/CMakeLists.txt -text +SAS/TriggerServices/lib/__init__.py -text +SAS/TriggerServices/lib/config.py -text +SAS/TriggerServices/lib/trigger_service.py -text +SAS/TriggerServices/lib/trigger_service_rpc.py -text +SAS/TriggerServices/test/CMakeLists.txt -text +SAS/TriggerServices/test/setup_queues_and_services.sh -text +SAS/TriggerServices/test/trigger-testing.xml -text +SAS/TriggerServices/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/CMakeLists.txt b/SAS/CMakeLists.txt index 6564510e3b11b2fae7c0fe9398a547c3af1cba27..89e046237615d664e19bf90902850e7100c746cb 100644 --- a/SAS/CMakeLists.txt +++ b/SAS/CMakeLists.txt @@ -8,8 +8,8 @@ lofar_add_package(Scheduler) lofar_add_package(SAS_Feedback Feedback_Service) lofar_add_package(OTDB_Services) lofar_add_package(XML_generator) -lofar_add_package(Trigger_Services) -lofar_add_package(Specification_Services) +lofar_add_package(TriggerServices) +lofar_add_package(SpecificationServices) add_subdirectory(MoM) add_subdirectory(ResourceAssignment) diff --git a/SAS/Specification_Services/CMakeLists.txt b/SAS/SpecificationServices/CMakeLists.txt similarity index 100% rename from SAS/Specification_Services/CMakeLists.txt rename to SAS/SpecificationServices/CMakeLists.txt diff --git a/SAS/Specification_Services/bin/CMakeLists.txt b/SAS/SpecificationServices/bin/CMakeLists.txt similarity index 100% rename from SAS/Specification_Services/bin/CMakeLists.txt rename to SAS/SpecificationServices/bin/CMakeLists.txt diff --git a/SAS/Specification_Services/bin/specificationservice b/SAS/SpecificationServices/bin/specificationservice similarity index 100% rename from SAS/Specification_Services/bin/specificationservice rename to SAS/SpecificationServices/bin/specificationservice diff --git a/SAS/Specification_Services/bin/specificationservice.ini b/SAS/SpecificationServices/bin/specificationservice.ini similarity index 100% rename from SAS/Specification_Services/bin/specificationservice.ini rename to SAS/SpecificationServices/bin/specificationservice.ini diff --git a/SAS/Specification_Services/bin/specificationtranslationservice b/SAS/SpecificationServices/bin/specificationtranslationservice similarity index 100% rename from SAS/Specification_Services/bin/specificationtranslationservice rename to SAS/SpecificationServices/bin/specificationtranslationservice diff --git a/SAS/Specification_Services/bin/specificationtranslationservice.ini b/SAS/SpecificationServices/bin/specificationtranslationservice.ini similarity index 100% rename from SAS/Specification_Services/bin/specificationtranslationservice.ini rename to SAS/SpecificationServices/bin/specificationtranslationservice.ini diff --git a/SAS/Specification_Services/bin/specificationvalidationservice b/SAS/SpecificationServices/bin/specificationvalidationservice similarity index 100% rename from SAS/Specification_Services/bin/specificationvalidationservice rename to SAS/SpecificationServices/bin/specificationvalidationservice diff --git a/SAS/Specification_Services/bin/specificationvalidationservice.ini b/SAS/SpecificationServices/bin/specificationvalidationservice.ini similarity index 100% rename from SAS/Specification_Services/bin/specificationvalidationservice.ini rename to SAS/SpecificationServices/bin/specificationvalidationservice.ini diff --git a/SAS/Specification_Services/lib/CMakeLists.txt b/SAS/SpecificationServices/lib/CMakeLists.txt similarity index 100% rename from SAS/Specification_Services/lib/CMakeLists.txt rename to SAS/SpecificationServices/lib/CMakeLists.txt diff --git a/SAS/Specification_Services/lib/__init__.py b/SAS/SpecificationServices/lib/__init__.py similarity index 100% rename from SAS/Specification_Services/lib/__init__.py rename to SAS/SpecificationServices/lib/__init__.py diff --git a/SAS/Specification_Services/lib/config.py b/SAS/SpecificationServices/lib/config.py similarity index 100% rename from SAS/Specification_Services/lib/config.py rename to SAS/SpecificationServices/lib/config.py diff --git a/SAS/Specification_Services/lib/specification_service.py b/SAS/SpecificationServices/lib/specification_service.py similarity index 100% rename from SAS/Specification_Services/lib/specification_service.py rename to SAS/SpecificationServices/lib/specification_service.py diff --git a/SAS/Specification_Services/lib/specification_service_rpc.py b/SAS/SpecificationServices/lib/specification_service_rpc.py similarity index 100% rename from SAS/Specification_Services/lib/specification_service_rpc.py rename to SAS/SpecificationServices/lib/specification_service_rpc.py diff --git a/SAS/Specification_Services/lib/translation_service.py b/SAS/SpecificationServices/lib/translation_service.py similarity index 100% rename from SAS/Specification_Services/lib/translation_service.py rename to SAS/SpecificationServices/lib/translation_service.py diff --git a/SAS/Specification_Services/lib/translation_service_rpc.py b/SAS/SpecificationServices/lib/translation_service_rpc.py similarity index 100% rename from SAS/Specification_Services/lib/translation_service_rpc.py rename to SAS/SpecificationServices/lib/translation_service_rpc.py diff --git a/SAS/Specification_Services/lib/validation_service.py b/SAS/SpecificationServices/lib/validation_service.py similarity index 100% rename from SAS/Specification_Services/lib/validation_service.py rename to SAS/SpecificationServices/lib/validation_service.py diff --git a/SAS/Specification_Services/lib/validation_service_rpc.py b/SAS/SpecificationServices/lib/validation_service_rpc.py similarity index 100% rename from SAS/Specification_Services/lib/validation_service_rpc.py rename to SAS/SpecificationServices/lib/validation_service_rpc.py diff --git a/SAS/Specification_Services/test/CMakeLists.txt b/SAS/SpecificationServices/test/CMakeLists.txt similarity index 100% rename from SAS/Specification_Services/test/CMakeLists.txt rename to SAS/SpecificationServices/test/CMakeLists.txt diff --git a/SAS/Specification_Services/test/frombus.py b/SAS/SpecificationServices/test/frombus.py similarity index 100% rename from SAS/Specification_Services/test/frombus.py rename to SAS/SpecificationServices/test/frombus.py diff --git a/SAS/Specification_Services/xsd/CMakeLists.txt b/SAS/SpecificationServices/xsd/CMakeLists.txt similarity index 100% rename from SAS/Specification_Services/xsd/CMakeLists.txt rename to SAS/SpecificationServices/xsd/CMakeLists.txt diff --git a/SAS/Specification_Services/xsd/LofarBase.xsd b/SAS/SpecificationServices/xsd/LofarBase.xsd similarity index 100% rename from SAS/Specification_Services/xsd/LofarBase.xsd rename to SAS/SpecificationServices/xsd/LofarBase.xsd diff --git a/SAS/Specification_Services/xsd/LofarHistorical.xsd b/SAS/SpecificationServices/xsd/LofarHistorical.xsd similarity index 100% rename from SAS/Specification_Services/xsd/LofarHistorical.xsd rename to SAS/SpecificationServices/xsd/LofarHistorical.xsd diff --git a/SAS/Specification_Services/xsd/LofarMoM2.xsd b/SAS/SpecificationServices/xsd/LofarMoM2.xsd similarity index 100% rename from SAS/Specification_Services/xsd/LofarMoM2.xsd rename to SAS/SpecificationServices/xsd/LofarMoM2.xsd diff --git a/SAS/Specification_Services/xsd/LofarProject.xsd b/SAS/SpecificationServices/xsd/LofarProject.xsd similarity index 100% rename from SAS/Specification_Services/xsd/LofarProject.xsd rename to SAS/SpecificationServices/xsd/LofarProject.xsd diff --git a/SAS/Specification_Services/xsd/LofarSpecification.xsd b/SAS/SpecificationServices/xsd/LofarSpecification.xsd similarity index 100% rename from SAS/Specification_Services/xsd/LofarSpecification.xsd rename to SAS/SpecificationServices/xsd/LofarSpecification.xsd diff --git a/SAS/Specification_Services/xsd/LofarTrigger.xsd b/SAS/SpecificationServices/xsd/LofarTrigger.xsd similarity index 100% rename from SAS/Specification_Services/xsd/LofarTrigger.xsd rename to SAS/SpecificationServices/xsd/LofarTrigger.xsd diff --git a/SAS/Specification_Services/xsd/MoM2.xsd b/SAS/SpecificationServices/xsd/MoM2.xsd similarity index 100% rename from SAS/Specification_Services/xsd/MoM2.xsd rename to SAS/SpecificationServices/xsd/MoM2.xsd diff --git a/SAS/Specification_Services/xsd/PersistentObjects.xsd b/SAS/SpecificationServices/xsd/PersistentObjects.xsd similarity index 100% rename from SAS/Specification_Services/xsd/PersistentObjects.xsd rename to SAS/SpecificationServices/xsd/PersistentObjects.xsd diff --git a/SAS/Specification_Services/xsd/UserAdmin.xsd b/SAS/SpecificationServices/xsd/UserAdmin.xsd similarity index 100% rename from SAS/Specification_Services/xsd/UserAdmin.xsd rename to SAS/SpecificationServices/xsd/UserAdmin.xsd diff --git a/SAS/Trigger_Services/CMakeLists.txt b/SAS/TriggerServices/CMakeLists.txt similarity index 100% rename from SAS/Trigger_Services/CMakeLists.txt rename to SAS/TriggerServices/CMakeLists.txt diff --git a/SAS/Trigger_Services/__init__.py b/SAS/TriggerServices/__init__.py similarity index 100% rename from SAS/Trigger_Services/__init__.py rename to SAS/TriggerServices/__init__.py diff --git a/SAS/Trigger_Services/bin/CMakeLists.txt b/SAS/TriggerServices/bin/CMakeLists.txt similarity index 100% rename from SAS/Trigger_Services/bin/CMakeLists.txt rename to SAS/TriggerServices/bin/CMakeLists.txt diff --git a/SAS/Trigger_Services/bin/triggerrestinterface b/SAS/TriggerServices/bin/triggerrestinterface similarity index 100% rename from SAS/Trigger_Services/bin/triggerrestinterface rename to SAS/TriggerServices/bin/triggerrestinterface diff --git a/SAS/Trigger_Services/bin/triggerrestinterface.ini b/SAS/TriggerServices/bin/triggerrestinterface.ini similarity index 100% rename from SAS/Trigger_Services/bin/triggerrestinterface.ini rename to SAS/TriggerServices/bin/triggerrestinterface.ini diff --git a/SAS/Trigger_Services/bin/triggerservice b/SAS/TriggerServices/bin/triggerservice similarity index 100% rename from SAS/Trigger_Services/bin/triggerservice rename to SAS/TriggerServices/bin/triggerservice diff --git a/SAS/Trigger_Services/bin/triggerservice.ini b/SAS/TriggerServices/bin/triggerservice.ini similarity index 100% rename from SAS/Trigger_Services/bin/triggerservice.ini rename to SAS/TriggerServices/bin/triggerservice.ini diff --git a/SAS/Trigger_Services/django_rest/CMakeLists.txt b/SAS/TriggerServices/django_rest/CMakeLists.txt similarity index 100% rename from SAS/Trigger_Services/django_rest/CMakeLists.txt rename to SAS/TriggerServices/django_rest/CMakeLists.txt diff --git a/SAS/Trigger_Services/django_rest/db.sqlite3 b/SAS/TriggerServices/django_rest/db.sqlite3 similarity index 100% rename from SAS/Trigger_Services/django_rest/db.sqlite3 rename to SAS/TriggerServices/django_rest/db.sqlite3 diff --git a/SAS/Trigger_Services/django_rest/manage.py b/SAS/TriggerServices/django_rest/manage.py similarity index 100% rename from SAS/Trigger_Services/django_rest/manage.py rename to SAS/TriggerServices/django_rest/manage.py diff --git a/SAS/Trigger_Services/django_rest/readme.txt b/SAS/TriggerServices/django_rest/readme.txt similarity index 100% rename from SAS/Trigger_Services/django_rest/readme.txt rename to SAS/TriggerServices/django_rest/readme.txt diff --git a/SAS/Trigger_Services/django_rest/restinterface/.idea/.name b/SAS/TriggerServices/django_rest/restinterface/.idea/.name similarity index 100% rename from SAS/Trigger_Services/django_rest/restinterface/.idea/.name rename to SAS/TriggerServices/django_rest/restinterface/.idea/.name diff --git a/SAS/Trigger_Services/django_rest/restinterface/.idea/encodings.xml b/SAS/TriggerServices/django_rest/restinterface/.idea/encodings.xml similarity index 100% rename from SAS/Trigger_Services/django_rest/restinterface/.idea/encodings.xml rename to SAS/TriggerServices/django_rest/restinterface/.idea/encodings.xml diff --git a/SAS/Trigger_Services/django_rest/restinterface/.idea/inspectionProfiles/Project_Default.xml b/SAS/TriggerServices/django_rest/restinterface/.idea/inspectionProfiles/Project_Default.xml similarity index 100% rename from SAS/Trigger_Services/django_rest/restinterface/.idea/inspectionProfiles/Project_Default.xml rename to SAS/TriggerServices/django_rest/restinterface/.idea/inspectionProfiles/Project_Default.xml diff --git a/SAS/Trigger_Services/django_rest/restinterface/.idea/inspectionProfiles/profiles_settings.xml b/SAS/TriggerServices/django_rest/restinterface/.idea/inspectionProfiles/profiles_settings.xml similarity index 100% rename from SAS/Trigger_Services/django_rest/restinterface/.idea/inspectionProfiles/profiles_settings.xml rename to SAS/TriggerServices/django_rest/restinterface/.idea/inspectionProfiles/profiles_settings.xml diff --git a/SAS/Trigger_Services/django_rest/restinterface/.idea/misc.xml b/SAS/TriggerServices/django_rest/restinterface/.idea/misc.xml similarity index 100% rename from SAS/Trigger_Services/django_rest/restinterface/.idea/misc.xml rename to SAS/TriggerServices/django_rest/restinterface/.idea/misc.xml diff --git a/SAS/Trigger_Services/django_rest/restinterface/.idea/modules.xml b/SAS/TriggerServices/django_rest/restinterface/.idea/modules.xml similarity index 100% rename from SAS/Trigger_Services/django_rest/restinterface/.idea/modules.xml rename to SAS/TriggerServices/django_rest/restinterface/.idea/modules.xml diff --git a/SAS/Trigger_Services/django_rest/restinterface/.idea/scopes/scope_settings.xml b/SAS/TriggerServices/django_rest/restinterface/.idea/scopes/scope_settings.xml similarity index 100% rename from SAS/Trigger_Services/django_rest/restinterface/.idea/scopes/scope_settings.xml rename to SAS/TriggerServices/django_rest/restinterface/.idea/scopes/scope_settings.xml diff --git a/SAS/Trigger_Services/django_rest/restinterface/.idea/triggerservice.iml b/SAS/TriggerServices/django_rest/restinterface/.idea/triggerservice.iml similarity index 100% rename from SAS/Trigger_Services/django_rest/restinterface/.idea/triggerservice.iml rename to SAS/TriggerServices/django_rest/restinterface/.idea/triggerservice.iml diff --git a/SAS/Trigger_Services/django_rest/restinterface/.idea/vcs.xml b/SAS/TriggerServices/django_rest/restinterface/.idea/vcs.xml similarity index 100% rename from SAS/Trigger_Services/django_rest/restinterface/.idea/vcs.xml rename to SAS/TriggerServices/django_rest/restinterface/.idea/vcs.xml diff --git a/SAS/Trigger_Services/django_rest/restinterface/.idea/workspace.xml b/SAS/TriggerServices/django_rest/restinterface/.idea/workspace.xml similarity index 100% rename from SAS/Trigger_Services/django_rest/restinterface/.idea/workspace.xml rename to SAS/TriggerServices/django_rest/restinterface/.idea/workspace.xml diff --git a/SAS/Trigger_Services/django_rest/restinterface/CMakeLists.txt b/SAS/TriggerServices/django_rest/restinterface/CMakeLists.txt similarity index 100% rename from SAS/Trigger_Services/django_rest/restinterface/CMakeLists.txt rename to SAS/TriggerServices/django_rest/restinterface/CMakeLists.txt diff --git a/SAS/Trigger_Services/django_rest/restinterface/__init__.py b/SAS/TriggerServices/django_rest/restinterface/__init__.py similarity index 100% rename from SAS/Trigger_Services/django_rest/restinterface/__init__.py rename to SAS/TriggerServices/django_rest/restinterface/__init__.py diff --git a/SAS/Trigger_Services/django_rest/restinterface/credentials.py b/SAS/TriggerServices/django_rest/restinterface/credentials.py similarity index 100% rename from SAS/Trigger_Services/django_rest/restinterface/credentials.py rename to SAS/TriggerServices/django_rest/restinterface/credentials.py diff --git a/SAS/Trigger_Services/django_rest/restinterface/settings.py b/SAS/TriggerServices/django_rest/restinterface/settings.py similarity index 100% rename from SAS/Trigger_Services/django_rest/restinterface/settings.py rename to SAS/TriggerServices/django_rest/restinterface/settings.py diff --git a/SAS/Trigger_Services/django_rest/restinterface/triggerinterface/CMakeLists.txt b/SAS/TriggerServices/django_rest/restinterface/triggerinterface/CMakeLists.txt similarity index 100% rename from SAS/Trigger_Services/django_rest/restinterface/triggerinterface/CMakeLists.txt rename to SAS/TriggerServices/django_rest/restinterface/triggerinterface/CMakeLists.txt diff --git a/SAS/Trigger_Services/django_rest/restinterface/triggerinterface/__init__.py b/SAS/TriggerServices/django_rest/restinterface/triggerinterface/__init__.py similarity index 100% rename from SAS/Trigger_Services/django_rest/restinterface/triggerinterface/__init__.py rename to SAS/TriggerServices/django_rest/restinterface/triggerinterface/__init__.py diff --git a/SAS/Trigger_Services/django_rest/restinterface/triggerinterface/admin.py b/SAS/TriggerServices/django_rest/restinterface/triggerinterface/admin.py similarity index 100% rename from SAS/Trigger_Services/django_rest/restinterface/triggerinterface/admin.py rename to SAS/TriggerServices/django_rest/restinterface/triggerinterface/admin.py diff --git a/SAS/Trigger_Services/django_rest/restinterface/triggerinterface/apps.py b/SAS/TriggerServices/django_rest/restinterface/triggerinterface/apps.py similarity index 100% rename from SAS/Trigger_Services/django_rest/restinterface/triggerinterface/apps.py rename to SAS/TriggerServices/django_rest/restinterface/triggerinterface/apps.py diff --git a/SAS/Trigger_Services/django_rest/restinterface/triggerinterface/config.py b/SAS/TriggerServices/django_rest/restinterface/triggerinterface/config.py similarity index 100% rename from SAS/Trigger_Services/django_rest/restinterface/triggerinterface/config.py rename to SAS/TriggerServices/django_rest/restinterface/triggerinterface/config.py diff --git a/SAS/Trigger_Services/django_rest/restinterface/triggerinterface/migrations/__init__.py b/SAS/TriggerServices/django_rest/restinterface/triggerinterface/migrations/__init__.py similarity index 100% rename from SAS/Trigger_Services/django_rest/restinterface/triggerinterface/migrations/__init__.py rename to SAS/TriggerServices/django_rest/restinterface/triggerinterface/migrations/__init__.py diff --git a/SAS/Trigger_Services/django_rest/restinterface/triggerinterface/models.py b/SAS/TriggerServices/django_rest/restinterface/triggerinterface/models.py similarity index 100% rename from SAS/Trigger_Services/django_rest/restinterface/triggerinterface/models.py rename to SAS/TriggerServices/django_rest/restinterface/triggerinterface/models.py diff --git a/SAS/Trigger_Services/django_rest/restinterface/triggerinterface/serializers.py b/SAS/TriggerServices/django_rest/restinterface/triggerinterface/serializers.py similarity index 100% rename from SAS/Trigger_Services/django_rest/restinterface/triggerinterface/serializers.py rename to SAS/TriggerServices/django_rest/restinterface/triggerinterface/serializers.py diff --git a/SAS/Trigger_Services/django_rest/restinterface/triggerinterface/tests.py b/SAS/TriggerServices/django_rest/restinterface/triggerinterface/tests.py similarity index 100% rename from SAS/Trigger_Services/django_rest/restinterface/triggerinterface/tests.py rename to SAS/TriggerServices/django_rest/restinterface/triggerinterface/tests.py diff --git a/SAS/Trigger_Services/django_rest/restinterface/triggerinterface/views.py b/SAS/TriggerServices/django_rest/restinterface/triggerinterface/views.py similarity index 100% rename from SAS/Trigger_Services/django_rest/restinterface/triggerinterface/views.py rename to SAS/TriggerServices/django_rest/restinterface/triggerinterface/views.py diff --git a/SAS/Trigger_Services/django_rest/restinterface/urls.py b/SAS/TriggerServices/django_rest/restinterface/urls.py similarity index 100% rename from SAS/Trigger_Services/django_rest/restinterface/urls.py rename to SAS/TriggerServices/django_rest/restinterface/urls.py diff --git a/SAS/Trigger_Services/django_rest/restinterface/wsgi.py b/SAS/TriggerServices/django_rest/restinterface/wsgi.py similarity index 100% rename from SAS/Trigger_Services/django_rest/restinterface/wsgi.py rename to SAS/TriggerServices/django_rest/restinterface/wsgi.py diff --git a/SAS/Trigger_Services/django_rest/urls.py b/SAS/TriggerServices/django_rest/urls.py similarity index 100% rename from SAS/Trigger_Services/django_rest/urls.py rename to SAS/TriggerServices/django_rest/urls.py diff --git a/SAS/Trigger_Services/lib/CMakeLists.txt b/SAS/TriggerServices/lib/CMakeLists.txt similarity index 100% rename from SAS/Trigger_Services/lib/CMakeLists.txt rename to SAS/TriggerServices/lib/CMakeLists.txt diff --git a/SAS/Trigger_Services/lib/__init__.py b/SAS/TriggerServices/lib/__init__.py similarity index 100% rename from SAS/Trigger_Services/lib/__init__.py rename to SAS/TriggerServices/lib/__init__.py diff --git a/SAS/Trigger_Services/lib/config.py b/SAS/TriggerServices/lib/config.py similarity index 100% rename from SAS/Trigger_Services/lib/config.py rename to SAS/TriggerServices/lib/config.py diff --git a/SAS/Trigger_Services/lib/trigger_service.py b/SAS/TriggerServices/lib/trigger_service.py similarity index 100% rename from SAS/Trigger_Services/lib/trigger_service.py rename to SAS/TriggerServices/lib/trigger_service.py diff --git a/SAS/Trigger_Services/lib/trigger_service_rpc.py b/SAS/TriggerServices/lib/trigger_service_rpc.py similarity index 100% rename from SAS/Trigger_Services/lib/trigger_service_rpc.py rename to SAS/TriggerServices/lib/trigger_service_rpc.py diff --git a/SAS/Trigger_Services/test/CMakeLists.txt b/SAS/TriggerServices/test/CMakeLists.txt similarity index 100% rename from SAS/Trigger_Services/test/CMakeLists.txt rename to SAS/TriggerServices/test/CMakeLists.txt diff --git a/SAS/Trigger_Services/test/setup_queues_and_services.sh b/SAS/TriggerServices/test/setup_queues_and_services.sh similarity index 100% rename from SAS/Trigger_Services/test/setup_queues_and_services.sh rename to SAS/TriggerServices/test/setup_queues_and_services.sh diff --git a/SAS/Trigger_Services/test/trigger-testing.xml b/SAS/TriggerServices/test/trigger-testing.xml similarity index 100% rename from SAS/Trigger_Services/test/trigger-testing.xml rename to SAS/TriggerServices/test/trigger-testing.xml diff --git a/SAS/Trigger_Services/test/trigger_misc_testing_nov2016.xml b/SAS/TriggerServices/test/trigger_misc_testing_nov2016.xml similarity index 100% rename from SAS/Trigger_Services/test/trigger_misc_testing_nov2016.xml rename to SAS/TriggerServices/test/trigger_misc_testing_nov2016.xml