Changeset 6045 for trunk

Show
Ignore:
Timestamp:
11/10/11 18:24:55 (6 months ago)
Author:
mtld
Message:

updated schemas

Location:
trunk/pustefix-core/src/main/resources/PUSTEFIX-INF/schema
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/pustefix-core/src/main/resources/PUSTEFIX-INF/schema/config-fragments.xsd

    r5949 r6045  
    44  xmlns:xs="http://www.w3.org/2001/XMLSchema" 
    55  xmlns:fr="http://www.pustefix-framework.org/2008/namespace/config-fragments" 
     6  xmlns:prj="http://www.pustefix-framework.org/2008/namespace/project-config" 
    67  xmlns:prop="http://www.pustefix-framework.org/2008/namespace/context-xml-service-config" 
    78  xmlns:dos="http://www.pustefix-framework.org/2008/namespace/direct-output-service-config" 
    89  elementFormDefault="qualified"> 
    910   
    10   <xs:import namespace="http://www.pustefix-framework.org/2008/namespace/context-xml-service-config" schemaLocation="context-xml-service-config.xsd"></xs:import> 
    11   <xs:import namespace="http://www.pustefix-framework.org/2008/namespace/direct-output-service-config" schemaLocation="direct-output-service-config.xsd"></xs:import> 
     11  <xs:import namespace="http://www.pustefix-framework.org/2008/namespace/project-config" schemaLocation="http://www.pustefix-framework.org/2008/namespace/project-config-0_18.xsd"></xs:import> 
     12  <xs:import namespace="http://www.pustefix-framework.org/2008/namespace/context-xml-service-config" schemaLocation="http://www.pustefix-framework.org/2008/namespace/context-xml-service-config-0_18.xsd"></xs:import> 
     13  <xs:import namespace="http://www.pustefix-framework.org/2008/namespace/direct-output-service-config" schemaLocation="http://www.pustefix-framework.org/2008/namespace/direct-output-service-config.xsd"></xs:import> 
    1214   
    1315  <xs:element name="config-fragments" type="fr:configFragmentsType" /> 
    … …  
    3739      <xs:element name="conditions" type="fr:conditionsType" minOccurs="0" maxOccurs="unbounded"/> 
    3840      <xs:element name="authconstraints" type="fr:authconstraintsType" minOccurs="0" maxOccurs="unbounded"/> 
    39       <xs:element name="directoutputpagerequests" type="fr:directOutputPagerequestsType" maxOccurs="unbounded" 
    40         minOccurs="0" /> 
     41      <xs:element name="directoutputpagerequests" type="fr:directOutputPagerequestsType" maxOccurs="unbounded" minOccurs="0" /> 
     42      <xs:element name="tenants" type="fr:tenants" maxOccurs="unbounded" minOccurs="0" /> 
    4143    </xs:sequence> 
    4244  </xs:complexType> 
    … …  
    162164  </xs:complexType> 
    163165 
     166  <xs:complexType name="tenants"> 
     167    <xs:complexContent> 
     168      <xs:extension base="fr:sectionType"> 
     169        <xs:sequence> 
     170          <xs:element ref="prj:tenant" minOccurs="0" maxOccurs="unbounded" /> 
     171        </xs:sequence> 
     172      </xs:extension> 
     173    </xs:complexContent> 
     174  </xs:complexType> 
     175 
    164176</xs:schema> 

  • trunk/pustefix-core/src/main/resources/PUSTEFIX-INF/schema/project-config.xsd

    r6035 r6045  
    1616        <xsd:element name="project" type="project-type"/> 
    1717        <xsd:element name="editor" type="editor-type" minOccurs="0"/> 
     18        <xsd:element ref="config-include"/> 
     19        <xsd:element ref="tenant" minOccurs="0" maxOccurs="unbounded"/> 
    1820        <xsd:element name="xml-generator" type="xml-generator-type"/> 
     21        <xsd:element name="searchengine-sitemap" minOccurs="0"/> 
    1922        <xsd:element name="session-tracking-strategy" minOccurs="0"> 
    2023          <xsd:simpleType> 
    … …  
    288291  </xsd:complexType> 
    289292 
     293  <xsd:element name="config-include" type="configIncludeType"/> 
     294  
     295  <xsd:complexType name="configIncludeType"> 
     296    <xsd:attribute name="file" type="xsd:string" use="required"></xsd:attribute> 
     297    <xsd:attribute name="section" use="optional"> 
     298      <xsd:simpleType> 
     299        <xsd:restriction base="xsd:token"> 
     300          <xsd:enumeration value="tenants"/> 
     301        </xsd:restriction> 
     302      </xsd:simpleType> 
     303    </xsd:attribute> 
     304    <xsd:attribute name="refid" type="xsd:NCName" use="optional"></xsd:attribute> 
     305    <xsd:attribute name="xpath" type="xsd:string" use="optional"></xsd:attribute> 
     306    <xsd:attribute name="module" type="xsd:string" use="optional"></xsd:attribute> 
     307  </xsd:complexType> 
     308 
     309  <xsd:element name="tenant" type="tenantType"/> 
     310 
     311  <xsd:complexType name="tenantType"> 
     312    <xsd:sequence> 
     313      <xsd:choice> 
     314        <xsd:element name="choose"> 
     315          <xsd:complexType> 
     316            <xsd:sequence> 
     317              <xsd:element name="when" maxOccurs="unbounded"> 
     318                <xsd:complexType> 
     319                  <xsd:sequence> 
     320                    <xsd:element name="host" type="xsd:string"/> 
     321                  </xsd:sequence> 
     322                  <xsd:attribute name="test" type="xsd:string" use="required"/> 
     323                </xsd:complexType> 
     324              </xsd:element> 
     325              <xsd:element name="otherwise" minOccurs="0"> 
     326                <xsd:complexType> 
     327                  <xsd:sequence> 
     328                    <xsd:element name="host" type="xsd:string"/> 
     329                  </xsd:sequence> 
     330                </xsd:complexType> 
     331              </xsd:element> 
     332            </xsd:sequence> 
     333          </xsd:complexType> 
     334        </xsd:element> 
     335        <xsd:element name="host" type="xsd:string"/> 
     336      </xsd:choice> 
     337      <xsd:element name="lang" type="xsd:string"/> 
     338    </xsd:sequence> 
     339    <xsd:attribute name="name" type="xsd:string" use="required"/> 
     340  </xsd:complexType> 
     341 
    290342</xsd:schema>