[Smartfrog-checkins] core/components/cddlm/src/org/smartfrog/services/cddlm/xsd webserver.cdl,1.2,1.3 cddml.xsd,1.3,1.4

[Steve L. <st...@us...>]

Update of /cvsroot/smartfrog/core/components/cddlm/src/org/smartfrog/services/cddlm/xsd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29798/src/org/smartfrog/services/cddlm/xsd

Modified Files:
	webserver.cdl cddml.xsd 
Log Message:
more CDDLM

Index: cddml.xsd
===================================================================
RCS file: /cvsroot/smartfrog/core/components/cddlm/src/org/smartfrog/services/cddlm/xsd/cddml.xsd,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** cddml.xsd	2 Jul 2004 16:59:25 -0000	1.3
--- cddml.xsd	7 Jul 2004 16:00:58 -0000	1.4
***************
*** 1,8 ****
  <?xml version="1.0" encoding="UTF-8" ?>
  <!-- -->
! <xs:schema targetNamespace="urn:cddlm/xml/0.1"
    xmlns:cdl="urn:cddlm/xml/0.1"
    xmlns="urn:cddlm/xml/0.1" xmlns:wsa="http://schemas.xmlsoap.org/ws/2003/03/addressing"
!   xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    elementFormDefault="qualified" attributeFormDefault="unqualified">
  
--- 1,8 ----
  <?xml version="1.0" encoding="UTF-8" ?>
  <!-- -->
! <xsd:schema targetNamespace="urn:cddlm/xml/0.1"
    xmlns:cdl="urn:cddlm/xml/0.1"
    xmlns="urn:cddlm/xml/0.1" xmlns:wsa="http://schemas.xmlsoap.org/ws/2003/03/addressing"
!   xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    elementFormDefault="qualified" attributeFormDefault="unqualified">
  
***************
*** 23,29 ****
    <!-- ============================================================= -->
  
!   <xs:simpleType name="propertyModeType">
!     <xs:annotation>
!       <xs:documentation>
          -required: The user of the configurable component
            MUST assign values of this property.
--- 23,29 ----
    <!-- ============================================================= -->
  
!   <xsd:simpleType name="propertyModeType">
!     <xsd:annotation>
!       <xsd:documentation>
          -required: The user of the configurable component
            MUST assign values of this property.
***************
*** 35,46 ****
            MUST NOT assign values of this property but
            MAY refer to this property with (lazy) references.
!       </xs:documentation>
!     </xs:annotation>
!     <xs:restriction base="xs:string">
!       <xs:enumeration value="required"/>
!       <xs:enumeration value="optional"/>
!       <xs:enumeration value="automatic"/>
!     </xs:restriction>
!   </xs:simpleType>
  
  
--- 35,46 ----
            MUST NOT assign values of this property but
            MAY refer to this property with (lazy) references.
!       </xsd:documentation>
!     </xsd:annotation>
!     <xsd:restriction base="xsd:string">
!       <xsd:enumeration value="required"/>
!       <xsd:enumeration value="optional"/>
!       <xsd:enumeration value="automatic"/>
!     </xsd:restriction>
!   </xsd:simpleType>
  
  
***************
*** 48,56 ****
    <!-- naming rules for components ?-->
    <!-- ============================================================= -->
!   <xs:simpleType name="namingType">
!     <xs:restriction base="xs:string">
!       <xs:pattern value="[\p{L}\-\.][\p{L}\-\.\P{Nd}]*"/>
!     </xs:restriction>
!   </xs:simpleType>
  
  
--- 48,59 ----
    <!-- naming rules for components ?-->
    <!-- ============================================================= -->
!   <xsd:simpleType name="namingType">
!     <xsd:restriction base="xsd:NCName"/>
! <!--
!     <xsd:restriction base="xsd:string">
!       <xsd:pattern value="[\p{L}\-\.][\p{L}\-\.\P{Nd}]*"/>
!     </xsd:restriction>
! -->
!   </xsd:simpleType>
  
  
***************
*** 58,96 ****
    <!-- extendsType ?-->
    <!-- ============================================================= -->
!   <xs:simpleType name="extendsType">
!     <xs:annotation>
!       <xs:documentation>
          type for extensions.
!       </xs:documentation>
!     </xs:annotation>
!     <xs:restriction base="xs:QName">
!     </xs:restriction>
!   </xs:simpleType>
  
    <!-- ============================================================= -->
    <!-- refrootTrype ?-->
    <!-- ============================================================= -->
!   <xs:simpleType name="refrootTrype">
!     <xs:annotation>
!       <xs:documentation>
          Root references for references
!       </xs:documentation>
!     </xs:annotation>
!     <xs:restriction base="xs:QName">
!     </xs:restriction>
!   </xs:simpleType>
  
    <!-- ============================================================= -->
    <!-- refType ?-->
    <!-- ============================================================= -->
!   <xs:simpleType name="refType">
!     <xs:annotation>
!       <xs:documentation>
          type for references. XPath1.0 by default
!       </xs:documentation>
!     </xs:annotation>
!     <xs:restriction base="xs:string">
!     </xs:restriction>
!   </xs:simpleType>
  
    <!-- ============================================================= -->
--- 61,99 ----
    <!-- extendsType ?-->
    <!-- ============================================================= -->
!   <xsd:simpleType name="extendsType">
!     <xsd:annotation>
!       <xsd:documentation>
          type for extensions.
!       </xsd:documentation>
!     </xsd:annotation>
!     <xsd:restriction base="xsd:QName">
!     </xsd:restriction>
!   </xsd:simpleType>
  
    <!-- ============================================================= -->
    <!-- refrootTrype ?-->
    <!-- ============================================================= -->
!   <xsd:simpleType name="refrootTrype">
!     <xsd:annotation>
!       <xsd:documentation>
          Root references for references
!       </xsd:documentation>
!     </xsd:annotation>
!     <xsd:restriction base="xsd:QName">
!     </xsd:restriction>
!   </xsd:simpleType>
  
    <!-- ============================================================= -->
    <!-- refType ?-->
    <!-- ============================================================= -->
!   <xsd:simpleType name="refType">
!     <xsd:annotation>
!       <xsd:documentation>
          type for references. XPath1.0 by default
!       </xsd:documentation>
!     </xsd:annotation>
!     <xsd:restriction base="xsd:string">
!     </xsd:restriction>
!   </xsd:simpleType>
  
    <!-- ============================================================= -->
***************
*** 107,118 ****
    <!-- The @cdl:extends attribute defines inheritance-->
    <!-- ============================================================= -->
!   <xs:attribute name="extends" type="cdl:extendsType">
!     <xs:annotation>
!       <xs:documentation>
        The @cdl:extends attribute is used in a property list to inherit an
        existing property list.
!       </xs:documentation>
!     </xs:annotation>
!   </xs:attribute>
  
    <!-- ============================================================= -->
--- 110,121 ----
    <!-- The @cdl:extends attribute defines inheritance-->
    <!-- ============================================================= -->
!   <xsd:attribute name="extends" type="cdl:extendsType">
!     <xsd:annotation>
!       <xsd:documentation>
        The @cdl:extends attribute is used in a property list to inherit an
        existing property list.
!       </xsd:documentation>
!     </xsd:annotation>
!   </xsd:attribute>
  
    <!-- ============================================================= -->
***************
*** 120,130 ****
    <!-- ============================================================= -->
  
!   <xs:attribute name="mode" type="cdl:propertyModeType">
!     <xs:annotation>
!       <xs:documentation>
        mode of assigment
!       </xs:documentation>
!     </xs:annotation>
!   </xs:attribute>
  
  
--- 123,133 ----
    <!-- ============================================================= -->
  
!   <xsd:attribute name="mode" type="cdl:propertyModeType">
!     <xsd:annotation>
!       <xsd:documentation>
        mode of assigment
!       </xsd:documentation>
!     </xsd:annotation>
!   </xsd:attribute>
  
  
***************
*** 133,143 ****
    <!-- ============================================================= -->
  
!   <xs:attribute name="name" type="cdl:namingType">
!     <xs:annotation>
!       <xs:documentation>
        A unique name for the attribute
!       </xs:documentation>
!     </xs:annotation>
!   </xs:attribute>
  
    <!-- ============================================================= -->
--- 136,146 ----
    <!-- ============================================================= -->
  
!   <xsd:attribute name="name" type="cdl:namingType">
!     <xsd:annotation>
!       <xsd:documentation>
        A unique name for the attribute
!       </xsd:documentation>
!     </xsd:annotation>
!   </xsd:attribute>
  
    <!-- ============================================================= -->
***************
*** 145,155 ****
    <!-- ============================================================= -->
  
!   <xs:attribute name="ref" type="cdl:refType">
!     <xs:annotation>
!       <xs:documentation>
        A reference in the language specified by @cdl:pathlanguage
!       </xs:documentation>
!     </xs:annotation>
!   </xs:attribute>
  
    <!-- ============================================================= -->
--- 148,158 ----
    <!-- ============================================================= -->
  
!   <xsd:attribute name="ref" type="cdl:refType">
!     <xsd:annotation>
!       <xsd:documentation>
        A reference in the language specified by @cdl:pathlanguage
!       </xsd:documentation>
!     </xsd:annotation>
!   </xsd:attribute>
  
    <!-- ============================================================= -->
***************
*** 157,170 ****
    <!-- ============================================================= -->
  
!   <xs:attribute name="refroot" type="cdl:refrootTrype">
!     <xs:annotation>
!       <xs:documentation>
          This specifies the reference root for reference resolution.
          The default value is the QName of the property list that includes
          this node in its descendant.
!       </xs:documentation>
!     </xs:annotation>
!   </xs:attribute>
! 
  
    <!-- ============================================================= -->
--- 160,172 ----
    <!-- ============================================================= -->
  
!   <xsd:attribute name="refroot" type="cdl:refrootTrype">
!     <xsd:annotation>
!       <xsd:documentation>
          This specifies the reference root for reference resolution.
          The default value is the QName of the property list that includes
          this node in its descendant.
!       </xsd:documentation>
!     </xsd:annotation>
!   </xsd:attribute>
  
    <!-- ============================================================= -->
***************
*** 176,186 ****
    <!-- ============================================================= -->
  
!   <xs:complexType name="propertyListType">
!     <xs:sequence>
!       <xs:any minOccurs="0"/>
!     </xs:sequence>
!     <xs:attribute name="name" type="cdl:namingType" use="optional"/>
!     <xs:attribute name="extends" type="cdl:extendsType" use="optional"/>
!   </xs:complexType>
  
    <!-- ============================================================= -->
--- 178,186 ----
    <!-- ============================================================= -->
  
!   <xsd:complexType name="propertyListType">
!     <xsd:sequence>
!       <xsd:any minOccurs="0"/>
!     </xsd:sequence>
!   </xsd:complexType>
  
    <!-- ============================================================= -->
***************
*** 197,229 ****
    <!-- ============================================================= -->
  
!   <xs:element name="cdl">
!     <xs:annotation>
!       <xs:documentation>
          This is the root element.
!       </xs:documentation>
!     </xs:annotation>
!     <xs:complexType>
!       <xs:sequence>
!         <xs:element ref="import" minOccurs="0" />
!         <xs:element ref="include" minOccurs="0"/>
!         <xs:element ref="types" minOccurs="0" />
!         <xs:element ref="configuration" minOccurs="0" maxOccurs="1" />
!         <xs:element ref="system" minOccurs="0"  maxOccurs="1"/>
!       </xs:sequence>
  
        <!-- path language declaration-->
!       <xs:attribute name="pathlanguage"
!         type="xs:anyURI"
          use="optional"
          default="http://www.w3.org/TR/1999/REC-xpath-19991116"
          >
!       <xs:annotation>
!         <xs:documentation>
        The path language for reference resolution is XPath1.0 by default
!         </xs:documentation>
!       </xs:annotation>
!       </xs:attribute>
!     </xs:complexType>
!   </xs:element>
  
  
--- 197,230 ----
    <!-- ============================================================= -->
  
!   <xsd:element name="cdl">
!     <xsd:annotation>
!       <xsd:documentation>
          This is the root element.
!       </xsd:documentation>
!     </xsd:annotation>
!     <xsd:complexType>
!       <xsd:sequence>
!         <xsd:element ref="comment" minOccurs="0"/>
!         <xsd:element ref="import" minOccurs="0" />
!         <xsd:element ref="include" minOccurs="0"/>
!         <xsd:element ref="types" minOccurs="0" />
!         <xsd:element ref="configuration" minOccurs="0" maxOccurs="1" />
!         <xsd:element ref="system" minOccurs="0"  maxOccurs="1"/>
!       </xsd:sequence>
  
        <!-- path language declaration-->
!       <xsd:attribute name="pathlanguage"
!         type="xsd:anyURI"
          use="optional"
          default="http://www.w3.org/TR/1999/REC-xpath-19991116"
          >
!       <xsd:annotation>
!         <xsd:documentation>
        The path language for reference resolution is XPath1.0 by default
!         </xsd:documentation>
!       </xsd:annotation>
!       </xsd:attribute>
!     </xsd:complexType>
!   </xsd:element>
  
  
***************
*** 232,246 ****
    <!-- ============================================================= -->
  
!   <xs:element name="import">
!     <xs:complexType>
!       <xs:annotation>
!         <xs:documentation>
            The namespace and location of another CDL file to import
!         </xs:documentation>
!       </xs:annotation>
!       <xs:attribute name="namespace" type="xs:anyURI" use="required"/>
!       <xs:attribute name="location" type="xs:anyURI" use="required"/>
!     </xs:complexType>
!   </xs:element>
  
    <!-- ============================================================= -->
--- 233,247 ----
    <!-- ============================================================= -->
  
!   <xsd:element name="import">
!     <xsd:complexType>
!       <xsd:annotation>
!         <xsd:documentation>
            The namespace and location of another CDL file to import
!         </xsd:documentation>
!       </xsd:annotation>
!       <xsd:attribute name="namespace" type="xsd:anyURI" use="optional"/>
!       <xsd:attribute name="location" type="xsd:anyURI" use="required"/>
!     </xsd:complexType>
!   </xsd:element>
  
    <!-- ============================================================= -->
***************
*** 248,261 ****
    <!-- ============================================================= -->
  
!   <xs:element name="include">
!     <xs:complexType>
!       <xs:annotation>
!         <xs:documentation>
            The location of another CDL file to import.
!         </xs:documentation>
!       </xs:annotation>
!       <xs:attribute name="location" type="xs:anyURI" use="required"/>
!     </xs:complexType>
!   </xs:element>
  
  
--- 249,262 ----
    <!-- ============================================================= -->
  
!   <xsd:element name="include">
!     <xsd:complexType>
!       <xsd:annotation>
!         <xsd:documentation>
            The location of another CDL file to import.
!         </xsd:documentation>
!       </xsd:annotation>
!       <xsd:attribute name="location" type="xsd:anyURI" use="required"/>
!     </xsd:complexType>
!   </xsd:element>
  
  
***************
*** 264,276 ****
    <!-- ============================================================= -->
  
!   <xs:element name="types">
!     <xs:complexType>
!       <xs:annotation>
!         <xs:documentation>
            XML Schema type definitions
!         </xs:documentation>
!       </xs:annotation>
!     </xs:complexType>
!   </xs:element>
  
  
--- 265,280 ----
    <!-- ============================================================= -->
  
!   <xsd:element name="types">
!     <xsd:complexType>
!       <xsd:annotation>
!         <xsd:documentation>
            XML Schema type definitions
!         </xsd:documentation>
!       </xsd:annotation>
!       <xsd:sequence>
!         <xsd:any minOccurs="0"/>
!       </xsd:sequence>
!     </xsd:complexType>
!   </xsd:element>
  
  
***************
*** 279,294 ****
    <!-- ============================================================= -->
  
!   <xs:element name="configuration">
!     <xs:complexType mixed="false">
!       <xs:annotation>
!         <xs:documentation>
        The configuration declares components
!         </xs:documentation>
!       </xs:annotation>
!       <xs:choice minOccurs="0" maxOccurs="unbounded">
!         <xs:element  name="component" type="cdl:propertyListType"/>
!       </xs:choice>
!     </xs:complexType>
!   </xs:element>
  
    <!-- ============================================================= -->
--- 283,293 ----
    <!-- ============================================================= -->
  
!   <xsd:element name="configuration" type="cdl:propertyListType">
!       <xsd:annotation>
!         <xsd:documentation>
        The configuration declares components
!         </xsd:documentation>
!       </xsd:annotation>
!   </xsd:element>
  
    <!-- ============================================================= -->
***************
*** 296,306 ****
    <!-- ============================================================= -->
  
!   <xs:element name="system" type="cdl:propertyListType">
!     <xs:annotation>
!       <xs:documentation>
        The system is a component that describes what is to be deployed
!       </xs:documentation>
!     </xs:annotation>
!   </xs:element>
  
  
--- 295,305 ----
    <!-- ============================================================= -->
  
!   <xsd:element name="system" type="cdl:propertyListType">
!     <xsd:annotation>
!       <xsd:documentation>
        The system is a component that describes what is to be deployed
!       </xsd:documentation>
!     </xsd:annotation>
!   </xsd:element>
  
  
***************
*** 309,333 ****
    <!-- ============================================================= -->
  
!   <xs:complexType name="letType" >
!     <xs:annotation>
!       <xs:documentation>
        This is an assignment operation whose semantics are as yet undefined
!       </xs:documentation>
!     </xs:annotation>
!     <xs:attribute name="let" type="xs:NCName" use="required"/>
!     <xs:attribute name="refroot" type="cdl:refType" use="required"/>
!     <xs:attribute name="ref" type="cdl:refrootTrype" use="required"/>
!   </xs:complexType>
  
!   <xs:element name="assert" >
!     <xs:complexType>
!       <xs:sequence>
!         <xs:element name="let" minOccurs="0" maxOccurs="unbounded"  type="letType">
!         </xs:element>
!         <xs:element name="cond" minOccurs="1" maxOccurs="1" type="xs:string">
!         </xs:element>
!       </xs:sequence>
!     </xs:complexType>
!   </xs:element>
  
    <!-- ============================================================= -->
--- 308,332 ----
    <!-- ============================================================= -->
  
!   <xsd:complexType name="letType" >
!     <xsd:annotation>
!       <xsd:documentation>
        This is an assignment operation whose semantics are as yet undefined
!       </xsd:documentation>
!     </xsd:annotation>
!     <xsd:attribute name="let" type="xsd:NCName" use="required"/>
!     <xsd:attribute name="refroot" type="cdl:refType" use="required"/>
!     <xsd:attribute name="ref" type="cdl:refrootTrype" use="required"/>
!   </xsd:complexType>
  
!   <xsd:element name="assert" >
!     <xsd:complexType>
!       <xsd:sequence>
!         <xsd:element name="let" minOccurs="0" maxOccurs="unbounded"  type="letType">
!         </xsd:element>
!         <xsd:element name="cond" minOccurs="1" maxOccurs="1" type="xsd:string">
!         </xsd:element>
!       </xsd:sequence>
!     </xsd:complexType>
!   </xsd:element>
  
    <!-- ============================================================= -->
***************
*** 335,353 ****
    <!-- ============================================================= -->
  
!   <xs:element name="expression">
!     <xs:complexType>
!       <xs:annotation>
!         <xs:documentation>
          This evaluates an XPath expression
!         </xs:documentation>
!       </xs:annotation>
!       <xs:sequence>
!         <xs:element name="let" minOccurs="0" maxOccurs="unbounded" type="letType">
!         </xs:element>
!         <xs:element name="return" minOccurs="1" maxOccurs="1" type="xs:string">
!         </xs:element>
!       </xs:sequence>
!     </xs:complexType>
!   </xs:element>
  
  
--- 334,352 ----
    <!-- ============================================================= -->
  
!   <xsd:element name="expression">
!     <xsd:complexType>
!       <xsd:annotation>
!         <xsd:documentation>
          This evaluates an XPath expression
!         </xsd:documentation>
!       </xsd:annotation>
!       <xsd:sequence>
!         <xsd:element name="let" minOccurs="0" maxOccurs="unbounded" type="letType">
!         </xsd:element>
!         <xsd:element name="return" minOccurs="1" maxOccurs="1" type="xsd:string">
!         </xsd:element>
!       </xsd:sequence>
!     </xsd:complexType>
!   </xsd:element>
  
  
***************
*** 356,365 ****
    <!-- ============================================================= -->
  
!   <xs:complexType name="placementType">
!     <xs:attribute name="to" type="cdl:refType" use="required"/>
!   </xs:complexType>
  
!   <xs:element name="placement" type="cdl:placementType">
!   </xs:element>
  
  
--- 355,364 ----
    <!-- ============================================================= -->
  
!   <xsd:complexType name="placementType">
!     <xsd:attribute name="to" type="cdl:refType" use="required"/>
!   </xsd:complexType>
  
!   <xsd:element name="placement" type="cdl:placementType">
!   </xsd:element>
  
  
***************
*** 368,377 ****
    <!-- ============================================================= -->
  
!   <xs:attribute name="lazy" type="cdl:boolean" default="true" fixed="true" >
!     <xs:annotation>
!       <xs:documentation>
        mode of assigment
!       </xs:documentation>
!     </xs:annotation>
!   </xs:attribute>
! </xs:schema>
\ No newline at end of file
--- 367,397 ----
    <!-- ============================================================= -->
  
!   <xsd:attribute name="lazy" type="xsd:boolean" default="true" >
!     <xsd:annotation>
!       <xsd:documentation>
        mode of assigment
!       </xsd:documentation>
!     </xsd:annotation>
!   </xsd:attribute>
! 
! 
!   <!-- ============================================================= -->
!   <!-- Proposed : a comment element -->
!   <!-- can implicitly be used inside declarations that take xsd:any -->
!   <!-- ============================================================= -->
! 
!   <xsd:simpleType name="commentType" >
!     <xsd:annotation>
!       <xsd:documentation>
!         This is an arbitrary comment field
!       </xsd:documentation>
!     </xsd:annotation>
!     <xsd:restriction base="xsd:string" />
!   </xsd:simpleType>
! 
!   <xsd:element name="comment" type="cdl:commentType">
!   </xsd:element>
!   <!-- ============================================================= -->
!   <!-- end schema-->
!   <!-- ============================================================= -->
! </xsd:schema>
\ No newline at end of file

Index: webserver.cdl
===================================================================
RCS file: /cvsroot/smartfrog/core/components/cddlm/src/org/smartfrog/services/cddlm/xsd/webserver.cdl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** webserver.cdl	2 Jul 2004 16:59:25 -0000	1.2
--- webserver.cdl	7 Jul 2004 16:00:58 -0000	1.3
***************
*** 5,18 ****
    xsi:schemaLocation="urn:cddlm/xml/0.1 cddml.xsd">
    <!--<import/>-->
!   <cdl:types/>
    <cdl:configuration>
!     <cdl:component name="server">
        <port>8080</port>
        <security>true</security>
!     </cdl:component>
!     <cdl:component name="tomcat" extends="server">
        <basedir>
        </basedir>
!     </cdl:component>
  
   </cdl:configuration>
--- 5,32 ----
    xsi:schemaLocation="urn:cddlm/xml/0.1 cddml.xsd">
    <!--<import/>-->
!   <cdl:types>
!   </cdl:types>
    <cdl:configuration>
! 
!     <webapps name="webapp-base">
!       <app>security</app>
!       <app>logging</app>
!     </webapps>
! 
!     <webapps2 extends="webapp-base">
!       <app>testing</app>
!     </webapps2>
! 
! 
! 
! 
!     <server name="server">
        <port>8080</port>
        <security>true</security>
!     </server>
!     <server name="tomcat" extends="server">
        <basedir>
        </basedir>
!     </server>
  
   </cdl:configuration>