lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas dc.xsd,1.1,1.2 lenya.xsd,1.1,1.2 simple-document.xsd,1.1,1.2

"Gregor J. Rothfuss" <[email protected]> Sat, 10 May 2003 17:43:28 +0200
Newsgroups gmane.comp.cms.wyona.cvs
Message-ID <[email protected]>
Update of /repository/lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas
In directory erbium:/tmp/cvs-serv28155/src/webapp/lenya/pubs/default/config/doctypes/schemas

Modified Files:
	dc.xsd lenya.xsd simple-document.xsd 
Log Message:
menu for default publication, xopus work

moved more stuff to root sitemap

Index: dc.xsd
===================================================================
RCS file: /repository/lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/dc.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dc.xsd	30 Apr 2003 09:12:41 -0000	1.1
--- dc.xsd	10 May 2003 15:43:24 -0000	1.2
***************
*** 2,8 ****
  <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://dc.org/2003/" xmlns:dc="http://dc.org/2003/">
    <xs:element name="title" type="xs:string"/>
!   <xs:element name="creator">
!     <xs:complexType/>
!   </xs:element>
    <xs:element name="subject">
      <xs:complexType/>
--- 2,6 ----
  <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://dc.org/2003/" xmlns:dc="http://dc.org/2003/">
    <xs:element name="title" type="xs:string"/>
!   <xs:element name="creator" type="xs:string"/>
    <xs:element name="subject">
      <xs:complexType/>

Index: lenya.xsd
===================================================================
RCS file: /repository/lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/lenya.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** lenya.xsd	30 Apr 2003 09:12:41 -0000	1.1
--- lenya.xsd	10 May 2003 15:43:24 -0000	1.2
***************
*** 26,35 ****
      <xs:complexType>
        <xs:sequence>
!         <xs:element ref="lenya:page-title"/>
          <xs:element ref="lenya:abstract"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
!   <xs:element name="page-title" type="xs:string"/>
    <xs:element name="abstract" type="xs:string"/>
  </xs:schema>
--- 26,35 ----
      <xs:complexType>
        <xs:sequence>
!         <xs:element ref="lenya:document-title"/>
          <xs:element ref="lenya:abstract"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
!   <xs:element name="document-title" type="xs:string"/>
    <xs:element name="abstract" type="xs:string"/>
  </xs:schema>

Index: simple-document.xsd
===================================================================
RCS file: /repository/lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/simple-document.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** simple-document.xsd	30 Apr 2003 09:12:41 -0000	1.1
--- simple-document.xsd	10 May 2003 15:43:24 -0000	1.2
***************
*** 1,4 ****
  <?xml version="1.0" encoding="UTF-8"?>
! <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns:lenya="http://lenya.org/2003/">
    <xs:import namespace="http://lenya.org/2003/" schemaLocation="lenya.xsd"/>
    <xs:element name="simple-document">
--- 1,4 ----
  <?xml version="1.0" encoding="UTF-8"?>
! <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.lenya.org/2003/simple-document" xmlns:s="http://www.lenya.org/2003/simple-document" xmlns:lenya="http://lenya.org/2003/">
    <xs:import namespace="http://lenya.org/2003/" schemaLocation="lenya.xsd"/>
    <xs:element name="simple-document">
***************
*** 7,11 ****
          <xs:element ref="lenya:meta"/>
          <xs:element ref="lenya:header"/>
!         <xs:element ref="body"/>
        </xs:sequence>
      </xs:complexType>
--- 7,11 ----
          <xs:element ref="lenya:meta"/>
          <xs:element ref="lenya:header"/>
!         <xs:element ref="s:body"/>
        </xs:sequence>
      </xs:complexType>
***************
*** 14,38 ****
      <xs:complexType>
        <xs:sequence>
!         <xs:element ref="subtitle"/>
!         <xs:element ref="crossheading"/>
!         <xs:element ref="p"/>
!         <xs:element ref="informaltable"/>
!         <xs:element ref="itemizedlist"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
!   <xs:element name="subtitle">
!     <xs:complexType/>
!   </xs:element>
!   <xs:element name="crossheading">
!     <xs:complexType/>
!   </xs:element>
!   <xs:element name="p">
!     <xs:complexType/>
!   </xs:element>
    <xs:element name="informaltable">
      <xs:complexType>
        <xs:sequence>
!         <xs:element ref="tgroup"/>
        </xs:sequence>
      </xs:complexType>
--- 14,34 ----
      <xs:complexType>
        <xs:sequence>
!         <xs:element ref="s:subtitle"/>
!         <xs:choice maxOccurs="unbounded">
!           <xs:element ref="s:hl2"/>
!           <xs:element ref="s:informaltable"/>
!           <xs:element ref="s:media"/>
!           <xs:element ref="s:p"/>
!         </xs:choice>
!         <xs:element ref="s:itemizedlist"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
!   <xs:element name="subtitle" type="xs:string"/>
!   <xs:element name="hl2" type="xs:string"/>
    <xs:element name="informaltable">
      <xs:complexType>
        <xs:sequence>
!         <xs:element ref="s:tgroup"/>
        </xs:sequence>
      </xs:complexType>
***************
*** 41,45 ****
      <xs:complexType>
        <xs:sequence>
!         <xs:element ref="tbody"/>
        </xs:sequence>
      </xs:complexType>
--- 37,41 ----
      <xs:complexType>
        <xs:sequence>
!         <xs:element ref="s:tbody"/>
        </xs:sequence>
      </xs:complexType>
***************
*** 48,52 ****
      <xs:complexType>
        <xs:sequence>
!         <xs:element maxOccurs="unbounded" ref="row"/>
        </xs:sequence>
      </xs:complexType>
--- 44,48 ----
      <xs:complexType>
        <xs:sequence>
!         <xs:element maxOccurs="unbounded" ref="s:row"/>
        </xs:sequence>
      </xs:complexType>
***************
*** 55,74 ****
      <xs:complexType>
        <xs:sequence>
!         <xs:element maxOccurs="unbounded" ref="entry"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
    <xs:element name="entry">
!     <xs:complexType/>
    </xs:element>
    <xs:element name="itemizedlist">
      <xs:complexType>
        <xs:sequence>
!         <xs:element maxOccurs="unbounded" ref="listitem"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
    <xs:element name="listitem">
!     <xs:complexType/>
    </xs:element>
  </xs:schema>
--- 51,113 ----
      <xs:complexType>
        <xs:sequence>
!         <xs:element maxOccurs="unbounded" ref="s:entry"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
    <xs:element name="entry">
!     <xs:complexType mixed="true">
!       <xs:choice minOccurs="0" maxOccurs="unbounded">
!         <xs:element ref="s:bold"/>
!         <xs:element ref="s:emphasize"/>
!         <xs:element ref="s:ulink"/>
!       </xs:choice>
!     </xs:complexType>
!   </xs:element>
!   <xs:element name="media">
!     <xs:complexType>
!       <xs:sequence>
!         <xs:element ref="s:media-reference"/>
!         <xs:element ref="s:caption"/>
!       </xs:sequence>
!       <xs:attribute name="media-type" use="required" type="xs:NCName"/>
!     </xs:complexType>
!   </xs:element>
!   <xs:element name="media-reference">
!     <xs:complexType>
!       <xs:attribute name="alternate-text" use="required"/>
!       <xs:attribute name="source" use="required" type="xs:NCName"/>
!     </xs:complexType>
!   </xs:element>
!   <xs:element name="caption" type="xs:string"/>
!   <xs:element name="p">
!     <xs:complexType mixed="true">
!       <xs:choice minOccurs="0" maxOccurs="unbounded">
!         <xs:element ref="s:bold"/>
!         <xs:element ref="s:emphasize"/>
!         <xs:element ref="s:ulink"/>
!       </xs:choice>
!     </xs:complexType>
    </xs:element>
    <xs:element name="itemizedlist">
      <xs:complexType>
        <xs:sequence>
!         <xs:element maxOccurs="unbounded" ref="s:listitem"/>
        </xs:sequence>
      </xs:complexType>
    </xs:element>
    <xs:element name="listitem">
!     <xs:complexType mixed="true">
!       <xs:choice minOccurs="0" maxOccurs="unbounded">
!         <xs:element ref="s:emphasize"/>
!         <xs:element ref="s:ulink"/>
!       </xs:choice>
!     </xs:complexType>
!   </xs:element>
!   <xs:element name="emphasize" type="xs:string"/>
!   <xs:element name="ulink">
!     <xs:complexType mixed="true">
!       <xs:attribute name="url" use="required" type="xs:anyURI"/>
!     </xs:complexType>
    </xs:element>
+   <xs:element name="bold" type="xs:NCName"/>
  </xs:schema>