diff options
| author | abranson <andrew.branson@cern.ch> | 2011-10-18 17:00:33 +0200 |
|---|---|---|
| committer | abranson <andrew.branson@cern.ch> | 2011-10-18 17:00:33 +0200 |
| commit | 684e01bb190c7d0b95347b732aeb3cdeda4740d7 (patch) | |
| tree | f3b36e96a4e33b6e46a5e17a29e7492e9ecb4796 /resources/boot/OD | |
| parent | 38d30cd4f69178cef983ec13262a6f02826a9a45 (diff) | |
Module support
Diffstat (limited to 'resources/boot/OD')
| -rw-r--r--[-rwxr-xr-x] | resources/boot/OD/CompositeActivityDef.xsd (renamed from resources/boot/OD/CompositeActivityDef.xml) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | resources/boot/OD/ElementaryActivityDef.xsd (renamed from resources/boot/OD/ElementaryActivityDef.xml) | 0 | ||||
| -rw-r--r-- | resources/boot/OD/Module.xsd (renamed from resources/boot/OD/CristalModule.xsd) | 78 | ||||
| -rwxr-xr-x | resources/boot/OD/New.xml | 3 | ||||
| -rw-r--r--[-rwxr-xr-x] | resources/boot/OD/NewAgent.xsd (renamed from resources/boot/OD/NewAgent.xml) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | resources/boot/OD/NewItem.xsd (renamed from resources/boot/OD/NewItem.xml) | 0 | ||||
| -rwxr-xr-x | resources/boot/OD/NewLocalObjectDef.xml | 20 | ||||
| -rw-r--r--[-rwxr-xr-x] | resources/boot/OD/PredefinedStepOutcome.xsd (renamed from resources/boot/OD/PredefinedStepOutcome.xml) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | resources/boot/OD/PropertyDescription.xsd (renamed from resources/boot/OD/PropertyDescription.xml) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | resources/boot/OD/Schema.xsd (renamed from resources/boot/OD/Schema.xml) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | resources/boot/OD/Script.xsd (renamed from resources/boot/OD/Script.xml) | 0 |
11 files changed, 35 insertions, 66 deletions
diff --git a/resources/boot/OD/CompositeActivityDef.xml b/resources/boot/OD/CompositeActivityDef.xsd index e840734..e840734 100755..100644 --- a/resources/boot/OD/CompositeActivityDef.xml +++ b/resources/boot/OD/CompositeActivityDef.xsd diff --git a/resources/boot/OD/ElementaryActivityDef.xml b/resources/boot/OD/ElementaryActivityDef.xsd index ea637e4..ea637e4 100755..100644 --- a/resources/boot/OD/ElementaryActivityDef.xml +++ b/resources/boot/OD/ElementaryActivityDef.xsd diff --git a/resources/boot/OD/CristalModule.xsd b/resources/boot/OD/Module.xsd index 348ab8b..78d34d7 100644 --- a/resources/boot/OD/CristalModule.xsd +++ b/resources/boot/OD/Module.xsd @@ -5,9 +5,6 @@ <xs:complexType>
<xs:sequence>
<xs:element name="Info">
- <xs:annotation>
- <xs:documentation>Module Metadata</xs:documentation>
- </xs:annotation>
<xs:complexType>
<xs:sequence>
<xs:element name="Description" type="xs:string"/>
@@ -36,6 +33,7 @@ <xs:extension base="xs:string">
<xs:attribute ref="event"/>
<xs:attribute ref="target"/>
+ <xs:attribute name="lang" type="xs:string"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
@@ -46,47 +44,21 @@ </xs:annotation>
<xs:complexType>
<xs:choice maxOccurs="unbounded">
- <xs:element name="Activity" minOccurs="0" maxOccurs="unbounded">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="name" type="xs:string" use="required"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="CompositeActivity" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>A composite activity outcome. </xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="name" type="xs:string" use="required"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="Schema" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>Elementary activities</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="name" type="xs:string" use="required"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="Script" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>Elementary activities</xs:documentation>
- </xs:annotation>
+ <xs:element name="Resource" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute name="name" type="xs:string" use="required"/>
+ <xs:attribute name="type" use="required">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="EA"/>
+ <xs:enumeration value="CA"/>
+ <xs:enumeration value="OD"/>
+ <xs:enumeration value="SC"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
@@ -94,18 +66,37 @@ <xs:element name="Item" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:sequence>
+ <xs:element name="Property" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
<xs:element name="Outcome" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:string">
- <xs:attribute name="Schema" type="xs:string" use="required"/>
- <xs:attribute name="Version" type="xs:string" use="required"/>
+ <xs:attribute name="schema" type="xs:string" use="required"/>
+ <xs:attribute name="version" type="xs:string" use="required"/>
+ <xs:attribute name="viewname" type="xs:string" use="required"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
+ <xs:element name="Dependency" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="DependencyMember" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
<xs:attribute name="name" type="xs:string" use="required"/>
+ <xs:attribute name="workflow" type="xs:string" use="optional"/>
</xs:complexType>
</xs:element>
<xs:element name="Agent" minOccurs="0" maxOccurs="unbounded">
@@ -114,7 +105,7 @@ <xs:element name="Role" type="xs:string" maxOccurs="unbounded"/>
</xs:sequence>
<xs:attribute name="name" type="xs:string" use="required"/>
- <xs:attribute name="passwordHash" type="xs:string" use="required"/>
+ <xs:attribute name="password" type="xs:string" use="required"/>
</xs:complexType>
</xs:element>
</xs:choice>
@@ -142,6 +133,7 @@ <xs:restriction base="xs:string">
<xs:enumeration value="startup"/>
<xs:enumeration value="shutdown"/>
+ <xs:enumeration value="install"/>
<xs:enumeration value="uninstall"/>
</xs:restriction>
</xs:simpleType>
diff --git a/resources/boot/OD/New.xml b/resources/boot/OD/New.xml deleted file mode 100755 index 91755c8..0000000 --- a/resources/boot/OD/New.xml +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-</xs:schema>
diff --git a/resources/boot/OD/NewAgent.xml b/resources/boot/OD/NewAgent.xsd index 773f4fc..773f4fc 100755..100644 --- a/resources/boot/OD/NewAgent.xml +++ b/resources/boot/OD/NewAgent.xsd diff --git a/resources/boot/OD/NewItem.xml b/resources/boot/OD/NewItem.xsd index bcd5298..bcd5298 100755..100644 --- a/resources/boot/OD/NewItem.xml +++ b/resources/boot/OD/NewItem.xsd diff --git a/resources/boot/OD/NewLocalObjectDef.xml b/resources/boot/OD/NewLocalObjectDef.xml deleted file mode 100755 index 0186872..0000000 --- a/resources/boot/OD/NewLocalObjectDef.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2006 sp1 U (http://www.altova.com) by Andrew Branson (CERN) -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:element name="NewLocalObjectDef">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="ObjectName" type="xs:string">
- <xs:annotation>
- <xs:documentation>Please give a name for your new object.</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="SubFolder" type="xs:string">
- <xs:annotation>
- <xs:documentation>If you want to store your object in a subfolder, give the subpath here.</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-</xs:schema>
diff --git a/resources/boot/OD/PredefinedStepOutcome.xml b/resources/boot/OD/PredefinedStepOutcome.xsd index bc0ac52..bc0ac52 100755..100644 --- a/resources/boot/OD/PredefinedStepOutcome.xml +++ b/resources/boot/OD/PredefinedStepOutcome.xsd diff --git a/resources/boot/OD/PropertyDescription.xml b/resources/boot/OD/PropertyDescription.xsd index 886092a..886092a 100755..100644 --- a/resources/boot/OD/PropertyDescription.xml +++ b/resources/boot/OD/PropertyDescription.xsd diff --git a/resources/boot/OD/Schema.xml b/resources/boot/OD/Schema.xsd index fed1949..fed1949 100755..100644 --- a/resources/boot/OD/Schema.xml +++ b/resources/boot/OD/Schema.xsd diff --git a/resources/boot/OD/Script.xml b/resources/boot/OD/Script.xsd index 5726aca..5726aca 100755..100644 --- a/resources/boot/OD/Script.xml +++ b/resources/boot/OD/Script.xsd |