You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2007/01/10 06:45:01 UTC
svn commit: r494724 [1/3] - in /ofbiz/site/dtds: service-eca.xsd
service-group.xsd services.xsd simple-methods.xsd site-conf.xsd
Author: jaz
Date: Tue Jan 9 21:45:00 2007
New Revision: 494724
URL: http://svn.apache.org/viewvc?view=rev&rev=494724
Log:
updated schemas
Modified:
ofbiz/site/dtds/service-eca.xsd
ofbiz/site/dtds/service-group.xsd
ofbiz/site/dtds/services.xsd
ofbiz/site/dtds/simple-methods.xsd
ofbiz/site/dtds/site-conf.xsd
Modified: ofbiz/site/dtds/service-eca.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/service-eca.xsd?view=diff&rev=494724&r1=494723&r2=494724
==============================================================================
--- ofbiz/site/dtds/service-eca.xsd (original)
+++ ofbiz/site/dtds/service-eca.xsd Tue Jan 9 21:45:00 2007
@@ -124,7 +124,7 @@
<xs:attribute type="xs:string" name="field-name" use="required"/>
<xs:attribute type="xs:string" name="env-name"/>
<xs:attribute type="xs:string" name="value"/>
- <xs:attribute type="xs:string" name="format">
+ <xs:attribute name="format">
<xs:simpleType>
<xs:restriction base="xs:token">
<xs:enumeration value="append"/>
Modified: ofbiz/site/dtds/service-group.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/service-group.xsd?view=diff&rev=494724&r1=494723&r2=494724
==============================================================================
--- ofbiz/site/dtds/service-group.xsd (original)
+++ ofbiz/site/dtds/service-group.xsd Tue Jan 9 21:45:00 2007
@@ -25,13 +25,13 @@
<xs:element name="group">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" ref="service"/>
+ <xs:element maxOccurs="unbounded" ref="invoke"/>
</xs:sequence>
<xs:attributeGroup ref="attlist.group"/>
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.group">
- <xs:attribute type="xs:string" name="name" use="required"/>
+ <xs:attribute type="xs:string" name="name" use="optional"/>
<xs:attribute name="send-mode" default="all">
<xs:simpleType>
<xs:restriction base="xs:token">
@@ -44,12 +44,12 @@
</xs:simpleType>
</xs:attribute>
</xs:attributeGroup>
- <xs:element name="service">
+ <xs:element name="invoke">
<xs:complexType>
- <xs:attributeGroup ref="attlist.service"/>
+ <xs:attributeGroup ref="attlist.invoke"/>
</xs:complexType>
</xs:element>
- <xs:attributeGroup name="attlist.service">
+ <xs:attributeGroup name="attlist.invoke">
<xs:attribute type="xs:string" name="name" use="required"/>
<xs:attribute name="mode" default="sync">
<xs:simpleType>
@@ -59,6 +59,14 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute name="parameters" default="preserve">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="optional"/>
+ <xs:enumeration value="preserve"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
<xs:attribute name="result-to-context" default="false">
<xs:simpleType>
<xs:restriction base="xs:token">
@@ -72,8 +80,8 @@
<!--
<service-group>
<group name="testOne" send-mode="none">
- <service name="testScv" mode="async"/>
- <service name="testScv" mode="sync"/>
+ <invoke name="testScv" mode="async"/>
+ <invoke name="testScv" mode="sync"/>
</group>
</service-group>
-->
Modified: ofbiz/site/dtds/services.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/services.xsd?view=diff&rev=494724&r1=494723&r2=494724
==============================================================================
--- ofbiz/site/dtds/services.xsd (original)
+++ ofbiz/site/dtds/services.xsd Tue Jan 9 21:45:00 2007
@@ -15,6 +15,7 @@
under the License.
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+ <xs:include schemaLocation="http://www.ofbiz.org/dtds/service-group.xsd"/>
<xs:element name="services">
<xs:complexType>
<xs:sequence>
@@ -36,10 +37,16 @@
<xs:sequence>
<xs:element minOccurs="0" ref="description"/>
<xs:element minOccurs="0" ref="namespace"/>
+ <xs:element minOccurs="0" maxOccurs="1" ref="permission-service"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="required-permissions"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="implements"/>
- <xs:element minOccurs="0" maxOccurs="unbounded" ref="auto-attributes"/>
- <xs:element minOccurs="0" maxOccurs="unbounded" ref="attribute"/>
+ <xs:choice maxOccurs="1" minOccurs="0">
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="auto-attributes"/>
+ <xs:element ref="attribute"/>
+ </xs:choice>
+ <xs:element ref="group"/>
+ </xs:choice>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="override"/>
</xs:sequence>
<xs:attributeGroup ref="attlist.service"/>
@@ -102,11 +109,29 @@
</xs:simpleType>
</xs:attribute>
</xs:attributeGroup>
+ <xs:element name="permission-service">
+ <xs:complexType>
+ <xs:attributeGroup ref="attlist.permission-service"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:attributeGroup name="attlist.permission-service">
+ <xs:attribute type="xs:string" name="service-name" use="required"/>
+ <xs:attribute name="main-action" use="optional">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="CREATE"/>
+ <xs:enumeration value="UPDATE"/>
+ <xs:enumeration value="DELETE"/>
+ <xs:enumeration value="VIEW"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:attributeGroup>
<xs:element name="required-permissions">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="check-permission"/>
- <xs:element minOccurs="0" maxOccurs="unbounded" ref="check-role-member"/>
+ <xs:element minOccurs="0" maxOccurs="unbounded" ref="check-role-member"/>
</xs:sequence>
<xs:attributeGroup ref="attlist.required-permissions"/>
</xs:complexType>
@@ -138,6 +163,15 @@
<xs:attributeGroup name="attlist.check-role-member">
<xs:attribute type="xs:string" name="role-type" use="required"/>
</xs:attributeGroup>
+ <xs:element name="service-security">
+ <xs:complexType>
+ <xs:attributeGroup ref="attlist.service-security"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:attributeGroup name="attlist.service-security">
+ <xs:attribute type="xs:string" name="name" use="required"/>
+ <xs:attribute type="xs:string" name="class" use="required"/>
+ </xs:attributeGroup>
<xs:element name="implements">
<xs:complexType>
<xs:attributeGroup ref="attlist.implements"/>
@@ -145,6 +179,15 @@
</xs:element>
<xs:attributeGroup name="attlist.implements">
<xs:attribute type="xs:string" name="service" use="required"/>
+ <xs:attribute name="optional" default="true">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="true"/>
+ <xs:enumeration value="false"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ </xs:attribute>
</xs:attributeGroup>
<xs:element name="auto-attributes">
<xs:complexType>
@@ -227,6 +270,7 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute type="xs:string" name="default-value"/>
<xs:attribute type="xs:string" name="form-label"/>
<xs:attribute type="xs:string" name="entity-name"/>
<xs:attribute type="xs:string" name="field-name"/>
@@ -271,6 +315,7 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute type="xs:string" name="default-value"/>
<xs:attribute type="xs:string" name="form-label"/>
<xs:attribute name="form-display">
<xs:simpleType>