sync schemas configs

DinoChiesa · May 11, 2018 · 169ab5b · 169ab5b
1 parent 47b96a3
commit 169ab5b
Show file tree

Hide file tree

Showing 10 changed files with 151 additions and 273 deletions.
diff --git a/schemas/policy/assign_message.xsd b/schemas/policy/assign_message.xsd
@@ -182,8 +182,8 @@
   </xs:complexType>
   <xs:simpleType name="messageType">
     <xs:restriction base="xs:string">
-      <xs:enumeration value="response"/>
       <xs:enumeration value="request"/>
+      <xs:enumeration value="response"/>
     </xs:restriction>
   </xs:simpleType>
 </xs:schema>
diff --git a/schemas/policy/cache.xsd b/schemas/policy/cache.xsd
@@ -9,17 +9,12 @@
   <xs:element name="Property" type="propertyBean"/>
   <xs:element name="ResponseCache" type="responseCacheBean"/>
   <xs:element name="stepDefinitionBean" type="stepDefinitionBean"/>
-  <xs:complexType name="responseCacheBean">
+  <xs:complexType name="invalidateCacheBean">
     <xs:complexContent>
       <xs:extension base="abstractCacheStepDefinitionBean">
         <xs:sequence>
-          <xs:element name="ExpirySettings" type="cacheExpiryBean" minOccurs="0"/>
-          <xs:element name="CacheLookupTimeoutInSeconds" type="xs:int" minOccurs="0"/>
-          <xs:element name="ExcludeErrorResponse" type="xs:boolean" minOccurs="0"/>
-          <xs:element name="SkipCacheLookup" type="xs:string" minOccurs="0"/>
-          <xs:element name="SkipCachePopulation" type="xs:string" minOccurs="0"/>
-          <xs:element name="UseAcceptHeader" type="xs:boolean" minOccurs="0"/>
-          <xs:element name="UseResponseCacheHeaders" type="xs:boolean" minOccurs="0"/>
+          <xs:element ref="CacheContext" minOccurs="0"/>
+          <xs:element name="PurgeChildEntries" type="xs:boolean"/>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
@@ -49,11 +44,11 @@
     </xs:complexContent>
   </xs:complexType>
   <xs:complexType name="leafBean" abstract="true"/>
-  <xs:complexType name="cacheExpiryBean">
+  <xs:complexType name="cacheContextBean">
     <xs:sequence>
-      <xs:element name="ExpiryDate" type="propertyBean" minOccurs="0"/>
-      <xs:element name="TimeOfDay" type="propertyBean" minOccurs="0"/>
-      <xs:element name="TimeoutInSec" type="propertyBean" minOccurs="0"/>
+      <xs:element name="APIProxyName" type="propertyBean" minOccurs="0"/>
+      <xs:element name="ProxyName" type="propertyBean" minOccurs="0"/>
+      <xs:element name="TargetName" type="propertyBean" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
   <xs:complexType name="propertyBean">
@@ -70,39 +65,44 @@
       <xs:element name="KeyFragment" type="propertyBean" minOccurs="0" maxOccurs="unbounded"/>
     </xs:sequence>
   </xs:complexType>
-  <xs:complexType name="populateCacheBean">
+  <xs:complexType name="lookupCacheBean">
     <xs:complexContent>
       <xs:extension base="abstractCacheStepDefinitionBean">
         <xs:sequence>
-          <xs:element name="ExpirySettings" type="cacheExpiryBean" minOccurs="0"/>
-          <xs:element name="Source" type="xs:string"/>
+          <xs:element name="AssignTo" type="xs:string"/>
+          <xs:element name="CacheLookupTimeoutInSeconds" type="xs:int" minOccurs="0"/>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-  <xs:complexType name="invalidateCacheBean">
+  <xs:complexType name="populateCacheBean">
     <xs:complexContent>
       <xs:extension base="abstractCacheStepDefinitionBean">
         <xs:sequence>
-          <xs:element ref="CacheContext" minOccurs="0"/>
-          <xs:element name="PurgeChildEntries" type="xs:boolean"/>
+          <xs:element name="ExpirySettings" type="cacheExpiryBean" minOccurs="0"/>
+          <xs:element name="Source" type="xs:string"/>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-  <xs:complexType name="cacheContextBean">
+  <xs:complexType name="cacheExpiryBean">
     <xs:sequence>
-      <xs:element name="APIProxyName" type="propertyBean" minOccurs="0"/>
-      <xs:element name="ProxyName" type="propertyBean" minOccurs="0"/>
-      <xs:element name="TargetName" type="propertyBean" minOccurs="0"/>
+      <xs:element name="ExpiryDate" type="propertyBean" minOccurs="0"/>
+      <xs:element name="TimeOfDay" type="propertyBean" minOccurs="0"/>
+      <xs:element name="TimeoutInSec" type="propertyBean" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
-  <xs:complexType name="lookupCacheBean">
+  <xs:complexType name="responseCacheBean">
     <xs:complexContent>
       <xs:extension base="abstractCacheStepDefinitionBean">
         <xs:sequence>
-          <xs:element name="AssignTo" type="xs:string"/>
+          <xs:element name="ExpirySettings" type="cacheExpiryBean" minOccurs="0"/>
           <xs:element name="CacheLookupTimeoutInSeconds" type="xs:int" minOccurs="0"/>
+          <xs:element name="ExcludeErrorResponse" type="xs:boolean" minOccurs="0"/>
+          <xs:element name="SkipCacheLookup" type="xs:string" minOccurs="0"/>
+          <xs:element name="SkipCachePopulation" type="xs:string" minOccurs="0"/>
+          <xs:element name="UseAcceptHeader" type="xs:boolean" minOccurs="0"/>
+          <xs:element name="UseResponseCacheHeaders" type="xs:boolean" minOccurs="0"/>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>

diff --git a/schemas/policy/extract_variables.xsd b/schemas/policy/extract_variables.xsd
@@ -155,19 +155,19 @@
   </xs:simpleType>
   <xs:simpleType name="type">
     <xs:restriction base="xs:string">
-      <xs:enumeration value="float"/>
+      <xs:enumeration value="string"/>
       <xs:enumeration value="integer"/>
       <xs:enumeration value="long"/>
       <xs:enumeration value="boolean"/>
-      <xs:enumeration value="string"/>
       <xs:enumeration value="nodeset"/>
+      <xs:enumeration value="float"/>
       <xs:enumeration value="double"/>
     </xs:restriction>
   </xs:simpleType>
   <xs:simpleType name="match">
     <xs:restriction base="xs:string">
-      <xs:enumeration value="first"/>
       <xs:enumeration value="all"/>
+      <xs:enumeration value="first"/>
     </xs:restriction>
   </xs:simpleType>
 </xs:schema>
diff --git a/schemas/policy/jwt.xsd b/schemas/policy/jwt.xsd
@@ -1,30 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<xs:schema version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0">
   <xs:element name="DecodeJWT" type="decodeJWTStepDefinitionBean"/>
-
-  <xs:element name="FaultRule" type="faultRuleBean"/>
-
   <xs:element name="GenerateJWT" type="generateJWTStepDefinitionBean"/>
-
-  <xs:element name="Policy" type="policy"/>
-
-  <xs:element name="Properties" type="jaxbProperties"/>
-
   <xs:element name="Property" type="propertyBean"/>
-
-  <xs:element name="Step" type="step"/>
-
   <xs:element name="VerifyJWT" type="verifyJWTStepDefinitionBean"/>
-
-  <xs:element name="beanImpl" type="beanImpl"/>
-
-  <xs:element name="inlineBean" type="inlineBean"/>
-
-  <xs:element name="jaxbPropertyEntry" type="jaxbPropertyEntry"/>
-
   <xs:element name="stepDefinitionBean" type="stepDefinitionBean"/>
-
   <xs:complexType name="verifyJWTStepDefinitionBean">
     <xs:complexContent>
       <xs:extension base="stepDefinitionBean">
@@ -57,44 +37,20 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-
   <xs:complexType name="stepDefinitionBean" abstract="true">
     <xs:complexContent>
       <xs:extension base="leafBean">
         <xs:sequence>
-          <xs:element name="Description" type="xs:string" minOccurs="0"/>
           <xs:element name="DisplayName" type="xs:string" minOccurs="0"/>
-          <xs:element name="FaultRules" minOccurs="0">
-            <xs:complexType>
-              <xs:sequence>
-                <xs:element ref="FaultRule" minOccurs="0" maxOccurs="unbounded"/>
-              </xs:sequence>
-            </xs:complexType>
-          </xs:element>
-          <xs:element ref="Properties" minOccurs="0"/>
         </xs:sequence>
+        <xs:attribute name="name" type="xs:string" use="required"/>
         <xs:attribute name="async" type="xs:string"/>
         <xs:attribute name="continueOnError" type="xs:string"/>
         <xs:attribute name="enabled" type="xs:string"/>
-        <xs:attribute name="version" type="xs:string"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-
-  <xs:complexType name="leafBean" abstract="true">
-    <xs:complexContent>
-      <xs:extension base="beanImpl">
-        <xs:sequence/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="beanImpl" abstract="true">
-    <xs:sequence/>
-    <xs:attribute name="isHybrid" type="xs:boolean"/>
-    <xs:attribute name="name" type="xs:string"/>
-  </xs:complexType>
-
+  <xs:complexType name="leafBean" abstract="true"/>
   <xs:complexType name="claim">
     <xs:simpleContent>
       <xs:extension base="xs:string">
@@ -105,15 +61,13 @@
       </xs:extension>
     </xs:simpleContent>
   </xs:complexType>
-
   <xs:complexType name="audienceBean">
     <xs:simpleContent>
       <xs:extension base="propertyBean">
         <xs:attribute name="parse" type="xs:string"/>
       </xs:extension>
     </xs:simpleContent>
   </xs:complexType>
-
   <xs:complexType name="propertyBean">
     <xs:simpleContent>
       <xs:extension base="xs:string">
@@ -122,7 +76,6 @@
       </xs:extension>
     </xs:simpleContent>
   </xs:complexType>
-
   <xs:complexType name="publicKeyBean">
     <xs:complexContent>
       <xs:extension base="keyBean">
@@ -132,22 +85,19 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-
   <xs:complexType name="keyBean">
     <xs:sequence>
       <xs:element name="Value" type="propertyBean" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="timeToLive" type="xs:string"/>
   </xs:complexType>
-
   <xs:complexType name="secretKeyBean">
     <xs:complexContent>
       <xs:extension base="encryptingKeyBean">
         <xs:sequence/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-
   <xs:complexType name="encryptingKeyBean">
     <xs:complexContent>
       <xs:extension base="keyBean">
@@ -157,70 +107,6 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-
-  <xs:complexType name="faultRuleBean">
-    <xs:complexContent>
-      <xs:extension base="inlineBean">
-        <xs:sequence>
-          <xs:element name="Condition" type="xs:string" minOccurs="0"/>
-          <xs:element name="Description" type="xs:string" minOccurs="0"/>
-          <xs:choice minOccurs="0" maxOccurs="unbounded">
-            <xs:element ref="Step"/>
-            <xs:element ref="Policy"/>
-          </xs:choice>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="inlineBean" abstract="true">
-    <xs:complexContent>
-      <xs:extension base="beanImpl">
-        <xs:sequence/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="step">
-    <xs:complexContent>
-      <xs:extension base="inlineBean">
-        <xs:sequence>
-          <xs:element name="Condition" type="xs:string" minOccurs="0"/>
-          <xs:element name="FaultRules" minOccurs="0">
-            <xs:complexType>
-              <xs:sequence>
-                <xs:element ref="FaultRule" minOccurs="0" maxOccurs="unbounded"/>
-              </xs:sequence>
-            </xs:complexType>
-          </xs:element>
-          <xs:element name="Name" type="xs:string"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="policy">
-    <xs:complexContent>
-      <xs:extension base="step">
-        <xs:sequence/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="jaxbProperties">
-    <xs:sequence>
-      <xs:element name="Property" type="jaxbPropertyEntry" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="jaxbPropertyEntry">
-    <xs:simpleContent>
-      <xs:extension base="xs:string">
-        <xs:attribute name="name" type="xs:string"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
   <xs:complexType name="generateJWTStepDefinitionBean">
     <xs:complexContent>
       <xs:extension base="stepDefinitionBean">
@@ -254,7 +140,6 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-
   <xs:complexType name="privateKeyBean">
     <xs:complexContent>
       <xs:extension base="encryptingKeyBean">
@@ -264,14 +149,7 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-
-  <xs:complexType name="keyStoreSource">
-    <xs:sequence>
-      <xs:element name="Alias" type="propertyBean"/>
-      <xs:element name="Name" type="propertyBean"/>
-    </xs:sequence>
   </xs:complexType>
-
   <xs:complexType name="decodeJWTStepDefinitionBean">
     <xs:complexContent>
       <xs:extension base="stepDefinitionBean">
@@ -283,4 +161,3 @@
     </xs:complexContent>
   </xs:complexType>
 </xs:schema>
-
diff --git a/schemas/policy/message_logging.xsd b/schemas/policy/message_logging.xsd
@@ -3,6 +3,13 @@
   <xs:element name="MessageLogging" type="messageLoggingBean"/>
   <xs:element name="RaiseAlert" type="raiseAlertBean"/>
   <xs:element name="stepDefinitionBean" type="stepDefinitionBean"/>
+  <xs:complexType name="raiseAlertBean">
+    <xs:complexContent>
+      <xs:extension base="messageLoggingBean">
+        <xs:sequence/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
   <xs:complexType name="messageLoggingBean">
     <xs:complexContent>
       <xs:extension base="stepDefinitionBean">
@@ -30,19 +37,12 @@
     </xs:complexContent>
   </xs:complexType>
   <xs:complexType name="leafBean" abstract="true"/>
-  <xs:complexType name="raiseAlertBean">
-    <xs:complexContent>
-      <xs:extension base="messageLoggingBean">
-        <xs:sequence/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
   <xs:simpleType name="logLevel">
     <xs:restriction base="xs:string">
       <xs:enumeration value="ALERT"/>
       <xs:enumeration value="WARN"/>
-      <xs:enumeration value="INFO"/>
       <xs:enumeration value="ERROR"/>
+      <xs:enumeration value="INFO"/>
     </xs:restriction>
   </xs:simpleType>
 </xs:schema>
diff --git a/schemas/policy/message_validation.xsd b/schemas/policy/message_validation.xsd
@@ -43,8 +43,8 @@
   </xs:complexType>
   <xs:simpleType name="soapVersion">
     <xs:restriction base="xs:string">
-      <xs:enumeration value="1.2"/>
       <xs:enumeration value="1.1"/>
+      <xs:enumeration value="1.2"/>
     </xs:restriction>
   </xs:simpleType>
 </xs:schema>