You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2017/12/01 20:57:52 UTC

svn commit: r1816907 - /myfaces/site/publish/tobago/tobago-config-4.0.xsd

Author: lofwyr
Date: Fri Dec  1 20:57:52 2017
New Revision: 1816907

URL: http://svn.apache.org/viewvc?rev=1816907&view=rev
Log:
prepare release

Modified:
    myfaces/site/publish/tobago/tobago-config-4.0.xsd

Modified: myfaces/site/publish/tobago/tobago-config-4.0.xsd
URL: http://svn.apache.org/viewvc/myfaces/site/publish/tobago/tobago-config-4.0.xsd?rev=1816907&r1=1816906&r2=1816907&view=diff
==============================================================================
--- myfaces/site/publish/tobago/tobago-config-4.0.xsd (original)
+++ myfaces/site/publish/tobago/tobago-config-4.0.xsd Fri Dec  1 20:57:52 2017
@@ -64,13 +64,21 @@
       <xs:element name="theme-config" type="tobago:theme-config-type" minOccurs="0"/>
       <xs:element name="create-session-secret" type="xs:boolean" minOccurs="0" default="true"/>
       <xs:element name="check-session-secret" type="xs:boolean" minOccurs="0" default="true"/>
-      <xs:element name="prevent-frame-attacks" type="xs:boolean" minOccurs="0" default="true"/>
+      <xs:element name="prevent-frame-attacks" type="xs:boolean" minOccurs="0" default="true">
+          <xs:annotation>
+            <xs:documentation>
+              Sets the HTTP header "X-Frame-Options" to "DENY".
+              This setting is deprecated but needed for IE11. The current way to configure this is using
+              the Content Security Policy directive 'frame-ancestors'.
+            </xs:documentation>
+          </xs:annotation>
+      </xs:element>
       <xs:element name="set-nosniff-header" type="xs:boolean" minOccurs="0" default="true"/>
       <xs:element name="classic-date-time-picker" type="xs:boolean" minOccurs="0" default="false"/>
       <xs:element name="content-security-policy" type="tobago:content-security-policy-type" minOccurs="0"/>
       <xs:element name="sanitizer" type="tobago:sanitizer-type" minOccurs="0"/>
+      <xs:element name="decode-line-feed" type="xs:boolean" minOccurs="0" default="true"/>
       <xs:element name="security-annotation" type="tobago:security-annotation-type" minOccurs="0" default="disable"/>
-      <xs:element name="renderers" type="tobago:renderers-type" minOccurs="0"/>
       <xs:element name="theme-definitions" type="tobago:theme-definitions-type" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="version"
@@ -106,11 +114,19 @@
 
   <xs:complexType name="content-security-policy-type">
     <xs:sequence>
-      <xs:element name="directive" type="xs:string" maxOccurs="unbounded" minOccurs="0"/>
+      <xs:element name="directive" type="tobago:directive-type" maxOccurs="unbounded" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="mode" type="tobago:scp-mode-type" use="required"/>
   </xs:complexType>
 
+  <xs:complexType name="directive-type">
+    <xs:simpleContent>
+      <xs:extension base="xs:string">
+        <xs:attribute name="name" type="xs:string" use="required"/>
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
   <xs:complexType name="sanitizer-type">
     <xs:sequence>
       <xs:element name="sanitizer-class" type="xs:string" maxOccurs="1" minOccurs="1"/>
@@ -126,25 +142,6 @@
     </xs:restriction>
   </xs:simpleType>
 
-  <xs:complexType name="renderers-type">
-    <xs:sequence>
-      <xs:element name="renderer" type="tobago:renderer-type" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="renderer-type">
-    <xs:sequence>
-      <xs:element name="name" type="xs:string"/>
-      <xs:element name="supported-markup" type="tobago:supported-markup-type"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="supported-markup-type">
-    <xs:sequence>
-      <xs:element name="markup" type="xs:string" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
   <xs:complexType name="theme-definitions-type">
     <xs:sequence>
       <xs:element name="theme-definition" type="tobago:theme-definition-type" maxOccurs="unbounded"/>
@@ -157,7 +154,6 @@
       <xs:element name="display-name" type="xs:string" minOccurs="0"/>
       <xs:element name="fallback" type="xs:string" minOccurs="0"/>
       <xs:element name="versioned" type="xs:boolean" minOccurs="0" default="false"/>
-      <xs:element name="renderers" type="tobago:renderers-type" minOccurs="0"/>
       <xs:element name="resources" type="tobago:resources-type" minOccurs="0" maxOccurs="unbounded"/>
     </xs:sequence>
   </xs:complexType>