From 146e9e99a375df0aa80e582882008cc6f09dac56 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Wed, 1 Apr 2015 10:57:44 +0100
Subject: [PATCH] fix schema, use jobmanagertype (lowercase) attr, re #11460
---
Code/Mantid/instrument/Facilities.xml | 2 +-
.../instrument/Schema/Facilities/1.0/FacilitiesSchema.xsd | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/Code/Mantid/instrument/Facilities.xml b/Code/Mantid/instrument/Facilities.xml
index 1213adaf378..5c4f469095b 100644
--- a/Code/Mantid/instrument/Facilities.xml
+++ b/Code/Mantid/instrument/Facilities.xml
@@ -6,7 +6,7 @@
<archiveSearch plugin="ISISDataSearch" />
</archive>
- <computeResource name="SCARF@STFC" JobManagerType="SCARFLSFJobManager">
+ <computeResource name="SCARF@STFC" jobmanagertype="SCARFLSFJobManager">
<baseURL>https://portal.scarf.rl.ac.uk</baseURL>
</computeResource>
diff --git a/Code/Mantid/instrument/Schema/Facilities/1.0/FacilitiesSchema.xsd b/Code/Mantid/instrument/Schema/Facilities/1.0/FacilitiesSchema.xsd
index 301d57d849d..1707f7dc087 100644
--- a/Code/Mantid/instrument/Schema/Facilities/1.0/FacilitiesSchema.xsd
+++ b/Code/Mantid/instrument/Schema/Facilities/1.0/FacilitiesSchema.xsd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" attributeFormDefault="unqualified" elementFormDefault="qualified"
xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0">
<xs:element name="facilities">
@@ -22,13 +22,12 @@
<xs:complexType>
<xs:choice maxOccurs="unbounded">
<xs:element name="baseURL" type="xs:string" />
- <xs:element name="JobManagerType" type="xs:string" />
<xs:element name="configFileURL" type="xs:string" />
<xs:element name="mpirunExecutable" type="xs:string" />
<xs:element name="pythonExecutable" type="xs:string" />
</xs:choice>
<xs:attribute name="name"/>
- <xs:attribute name="type"/>
+ <xs:attribute name="jobmanagertype"/>
</xs:complexType>
</xs:element>
<xs:element name="catalog">
--
GitLab