svn commit: r1597281 [1/5] - /ofbiz/site/dtds/
Locked
svn commit: r1597281 [1/5] - /ofbiz/site/dtds/
 
|
Author: jleroux
Date: Sat May 24 13:14:20 2014 New Revision: 1597281 URL: http://svn.apache.org/r1597281 Log: Updates all dtds Modified: ofbiz/site/dtds/entity-config.xsd ofbiz/site/dtds/entity-eca.xsd ofbiz/site/dtds/entitymodel.xsd ofbiz/site/dtds/l10n.dtd ofbiz/site/dtds/ofbiz-component.xsd ofbiz/site/dtds/ofbiz-containers.xsd ofbiz/site/dtds/ofbiz-properties.xsd ofbiz/site/dtds/security-config.xsd ofbiz/site/dtds/service-config.xsd ofbiz/site/dtds/services.xsd ofbiz/site/dtds/simple-methods.xsd ofbiz/site/dtds/site-conf.xsd ofbiz/site/dtds/test-suite.xsd ofbiz/site/dtds/widget-form.xsd ofbiz/site/dtds/widget-menu.xsd ofbiz/site/dtds/widget-screen.xsd ofbiz/site/dtds/widget-tree.xsd Modified: ofbiz/site/dtds/entity-config.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/entity-config.xsd?rev=1597281&r1=1597280&r2=1597281&view=diff ============================================================================== --- ofbiz/site/dtds/entity-config.xsd (original) +++ ofbiz/site/dtds/entity-config.xsd Sat May 24 13:14:20 2014 @@ -127,6 +127,7 @@ under the License. <xs:attribute type="xs:string" name="distributed-cache-clear-user-login-id" default="system"/> <xs:attribute type="xs:string" name="sequenced-id-prefix"/> <xs:attribute type="xs:string" name="default-group-name" default="org.ofbiz"/> + <xs:attribute type="xs:string" name="key-encrypting-key"/> </xs:attributeGroup> <xs:element name="group-map"> <xs:complexType> @@ -398,6 +399,15 @@ under the License. </xs:restriction> </xs:simpleType> </xs:attribute> + <xs:attribute name="offset-style" default="none"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="none"/> + <xs:enumeration value="fetch"/> + <xs:enumeration value="limit"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> <xs:attribute type="xs:string" name="table-type"/> <xs:attribute type="xs:string" name="character-set"/> <xs:attribute type="xs:string" name="collate"/> @@ -429,7 +439,8 @@ under the License. <xs:attribute type="xs:string" name="jdbc-driver" use="required"/> <xs:attribute type="xs:string" name="jdbc-uri" use="required"/> <xs:attribute type="xs:string" name="jdbc-username" use="required"/> - <xs:attribute type="xs:string" name="jdbc-password" use="required"/> + <xs:attribute type="xs:string" name="jdbc-password"/> + <xs:attribute type="xs:string" name="jdbc-password-lookup"/> <xs:attribute name="isolation-level"> <xs:simpleType> <xs:restriction base="xs:token"> @@ -451,12 +462,48 @@ under the License. </xs:annotation> </xs:attribute> <xs:attribute type="xs:nonNegativeInteger" name="time-between-eviction-runs-millis" default="600000"/> - <xs:attribute type="xs:nonNegativeInteger" name="pool-sleeptime" default="300000"/> - <xs:attribute type="xs:nonNegativeInteger" name="pool-lifetime" default="600000"/> - <xs:attribute type="xs:nonNegativeInteger" name="pool-deadlock-maxwait" default="300000"/> - <xs:attribute type="xs:nonNegativeInteger" name="pool-deadlock-retrywait" default="10000"/> - <xs:attribute type="xs:string" name="pool-jdbc-test-stmt"/> - <xs:attribute type="xs:string" name="pool-xa-wrapper-class" default="org.enhydra.jdbc.standard.StandardXADataSource"/> + <xs:attribute type="xs:nonNegativeInteger" name="pool-sleeptime" default="300000"> + <xs:annotation> + <xs:documentation> + This parameter is currently not implemented + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:nonNegativeInteger" name="pool-lifetime" default="600000"> + <xs:annotation> + <xs:documentation> + This parameter is currently not implemented + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:nonNegativeInteger" name="pool-deadlock-maxwait" default="300000"> + <xs:annotation> + <xs:documentation> + This parameter is currently not implemented + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:nonNegativeInteger" name="pool-deadlock-retrywait" default="10000"> + <xs:annotation> + <xs:documentation> + This parameter is currently not implemented + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:string" name="pool-jdbc-test-stmt"> + <xs:annotation> + <xs:documentation> + This parameter is currently not implemented + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:string" name="pool-xa-wrapper-class"> + <xs:annotation> + <xs:documentation> + This parameter is currently not implemented + </xs:documentation> + </xs:annotation> + </xs:attribute> </xs:attributeGroup> <xs:element name="jndi-jdbc"> <xs:complexType> Modified: ofbiz/site/dtds/entity-eca.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/entity-eca.xsd?rev=1597281&r1=1597280&r2=1597281&view=diff ============================================================================== --- ofbiz/site/dtds/entity-eca.xsd (original) +++ ofbiz/site/dtds/entity-eca.xsd Sat May 24 13:14:20 2014 @@ -236,14 +236,17 @@ under the License. </xs:simpleType> </xs:attribute> <xs:attribute type="xs:string" name="run-as-user" default="system"/> - <xs:attribute type="xs:string" name="value-attr"/> + <xs:attribute type="xs:string" name="value-attr"> + <xs:annotation> + <xs:documentation> + if value-attr is specified the generic value object corresponding to the entity in question will be passed + to the action service + </xs:documentation> + </xs:annotation> + </xs:attribute> </xs:attributeGroup> </xs:schema> <!-- - if value-attr is specified the generic value object corresponding to the entity in question will be passed - to the action service ---> -<!-- <entity-eca> <eca entity="Product" operation="create" event="return"> <condition field-name="foo" operator="equals" rhs="1"/> Modified: ofbiz/site/dtds/entitymodel.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/entitymodel.xsd?rev=1597281&r1=1597280&r2=1597281&view=diff ============================================================================== --- ofbiz/site/dtds/entitymodel.xsd (original) +++ ofbiz/site/dtds/entitymodel.xsd Sat May 24 13:14:20 2014 @@ -86,7 +86,14 @@ under the License. <xs:attribute name="package-name" type="xs:string" use="required"/> <xs:attribute name="default-resource-name" type="xs:string"/> <xs:attribute name="dependent-on" type="xs:string"/> - <xs:attribute name="sequence-bank-size" type="xs:string"/> + <xs:attribute name="sequence-bank-size" type="xs:string"> + <xs:annotation> + <xs:documentation> + The 10 default value is defined in the SequenceBank class by the defaultBankSize constant. + Can't be more than 5000 which is defined by the maxBankSize constant. + </xs:documentation> + </xs:annotation> + </xs:attribute> <xs:attribute name="enable-lock" default="false" type="boolean"/> <xs:attribute name="no-auto-stamp" default="false" type="boolean"/> <xs:attribute name="never-cache" default="false" type="boolean"/> @@ -256,6 +263,15 @@ under the License. <xs:attribute name="copyright" type="xs:string"/> <xs:attribute name="author" type="xs:string"/> <xs:attribute name="version" type="xs:string"/> + <xs:attribute name="redefinition" type="boolean"> + <xs:annotation> + <xs:documentation> + Indicates if this entity redefines an existing entity. + When set to "true" it will suppress "Entity is defined more than once" warnings. + Defaults to "false". + </xs:documentation> + </xs:annotation> + </xs:attribute> </xs:attributeGroup> <xs:element name="member-entity"> <xs:complexType> @@ -494,7 +510,14 @@ under the License. <xs:attribute name="entity-name" type="xs:string" use="required"/> <xs:attribute name="default-resource-name" type="xs:string"/> <xs:attribute name="dependent-on" type="xs:string"/> - <xs:attribute name="sequence-bank-size" type="xs:string"/> + <xs:attribute name="sequence-bank-size" type="xs:string"> + <xs:annotation> + <xs:documentation> + The 10 default value is defined in the SequenceBank class by the defaultBankSize constant. + Can't be more than 5000 which is defined by the maxBankSize constant. + </xs:documentation> + </xs:annotation> + </xs:attribute> <xs:attribute name="enable-lock" type="boolean"/> <xs:attribute name="no-auto-stamp" type="boolean"/> <xs:attribute name="never-cache" type="boolean"/> Modified: ofbiz/site/dtds/l10n.dtd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/l10n.dtd?rev=1597281&r1=1597280&r2=1597281&view=diff ============================================================================== --- ofbiz/site/dtds/l10n.dtd (original) +++ ofbiz/site/dtds/l10n.dtd Sat May 24 13:14:20 2014 @@ -23,6 +23,7 @@ %xmlns; CDATA #FIXED %uri; language CDATA #REQUIRED english-language-name CDATA #IMPLIED + href CDATA #IMPLIED > <!ELEMENT %gentext; EMPTY> Modified: ofbiz/site/dtds/ofbiz-component.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/ofbiz-component.xsd?rev=1597281&r1=1597280&r2=1597281&view=diff ============================================================================== --- ofbiz/site/dtds/ofbiz-component.xsd (original) +++ ofbiz/site/dtds/ofbiz-component.xsd Sat May 24 13:14:20 2014 @@ -29,6 +29,7 @@ under the License. <xs:element minOccurs="0" maxOccurs="unbounded" ref="test-suite"/> <xs:element minOccurs="0" maxOccurs="unbounded" ref="keystore"/> <xs:element minOccurs="0" maxOccurs="unbounded" ref="webapp"/> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="container"/> </xs:sequence> <xs:attributeGroup ref="attlist.ofbiz-component"/> </xs:complexType> @@ -197,8 +198,24 @@ under the License. <xs:attribute type="xs:string" name="server" use="required"/> <xs:attribute type="xs:string" name="location" use="required"/> <xs:attribute type="xs:string" name="mount-point"/> + <xs:attribute type="xs:string" name="access-permission"> + <xs:annotation> + <xs:documentation> + A user must have this permission to access the application. + When omitted, the application can be used by anyone. This + attribute takes precedence over the base-permission attribute - + if both attributes are not empty, this attribute will be used. + </xs:documentation> + </xs:annotation> + </xs:attribute> <xs:attribute type="xs:string" name="base-permission"> - <xs:annotation><xs:documentation>A user must have ALL of the permissions in the list to access the application</xs:documentation></xs:annotation> + <xs:annotation> + <xs:documentation> + Deprecated - use access-permission. + A user must have ALL of the permissions in the list to access the application. + When set to "NONE", the application can be used by anyone. + </xs:documentation> + </xs:annotation> </xs:attribute> <xs:attribute name="privileged" default="false"> <xs:simpleType> @@ -242,6 +259,39 @@ under the License. <xs:attribute type="xs:string" name="name" use="required"/> <xs:attribute type="xs:string" name="value" use="required"/> </xs:attributeGroup> + + <xs:element name="container"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="property"/> + </xs:sequence> + <xs:attributeGroup ref="attlist.container"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.container"> + <xs:attribute type="xs:string" name="name" use="required"/> + <xs:attribute type="xs:string" name="class" use="required"/> + <xs:attribute type="xs:string" name="loaders"/> + </xs:attributeGroup> + <xs:element name="property"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="property"/> + <xs:element minOccurs="0" ref="property-value"/> + </xs:sequence> + <xs:attributeGroup ref="attlist.property"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.property"> + <xs:attribute type="xs:string" name="name" use="required"/> + <xs:attribute type="xs:string" name="value"/> + </xs:attributeGroup> + <xs:element name="property-value" type="any"/> + <xs:complexType name="any" mixed="true"> + <xs:sequence> + <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/> + </xs:sequence> + </xs:complexType> </xs:schema> <!-- <ofbiz-component name="core"> Modified: ofbiz/site/dtds/ofbiz-containers.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/ofbiz-containers.xsd?rev=1597281&r1=1597280&r2=1597281&view=diff ============================================================================== --- ofbiz/site/dtds/ofbiz-containers.xsd (original) +++ ofbiz/site/dtds/ofbiz-containers.xsd Sat May 24 13:14:20 2014 @@ -36,6 +36,7 @@ under the License. <xs:attributeGroup name="attlist.container"> <xs:attribute type="xs:string" name="name" use="required"/> <xs:attribute type="xs:string" name="class" use="required"/> + <xs:attribute type="xs:string" name="loaders"/> </xs:attributeGroup> <xs:element name="property"> <xs:complexType> @@ -57,30 +58,3 @@ under the License. </xs:sequence> </xs:complexType> </xs:schema> -<!-- - - Container properties are relative to the implementation class for details - of which properties are available see the docs on the class defined. - - Example: - - <ofbiz-containers> - <container name="jetty-container" class="org.ofbiz.base.container.JettyContainer"> - <property name="default-listener"> - <property name="type" value="default"/> - <property name="host" value="0.0.0.0"/> - <property name="port" value="8080"/> - <property name="min-threads" value="5"/> - <property name="max-threads" value="250"/> - <property name="max-idle-time" value="30000"/> - <property name="max-read-time" value="60000"/> - </property> - </container> - <container name="component-container" class="org.ofbiz.base.container.ComponentContainer"> - <property name="entity" value="${ofbiz.home}/framework/entity/component.xml"/> - <property name="service" value="${ofbiz.home}/framework/service/component.xml"/> - <property name="party" value="${ofbiz.home}/applications/party/component.xml"/> - </container> - </ofbiz-containers> - ---> Modified: ofbiz/site/dtds/ofbiz-properties.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/ofbiz-properties.xsd?rev=1597281&r1=1597280&r2=1597281&view=diff ============================================================================== --- ofbiz/site/dtds/ofbiz-properties.xsd (original) +++ ofbiz/site/dtds/ofbiz-properties.xsd Sat May 24 13:14:20 2014 @@ -23,7 +23,7 @@ under the License. <xs:complexType name="valueType"> <xs:simpleContent> <xs:extension base="xs:string"> - <xs:attribute ref="xml:lang" /> + <xs:attribute ref="xml:lang" use="required"/> </xs:extension> </xs:simpleContent> </xs:complexType> Modified: ofbiz/site/dtds/security-config.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/security-config.xsd?rev=1597281&r1=1597280&r2=1597281&view=diff ============================================================================== --- ofbiz/site/dtds/security-config.xsd (original) +++ ofbiz/site/dtds/security-config.xsd Sat May 24 13:14:20 2014 @@ -27,11 +27,8 @@ under the License. </xs:element> <xs:element name="security"> <xs:complexType> - <xs:attributeGroup ref="attlist.security"/> + <xs:attribute name="name" use="required" /> + <xs:attribute name="class" use="required" /> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.security"> - <xs:attribute name="name" use="required"/> - <xs:attribute name="class"/> - </xs:attributeGroup> </xs:schema> Modified: ofbiz/site/dtds/service-config.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/service-config.xsd?rev=1597281&r1=1597280&r2=1597281&view=diff ============================================================================== --- ofbiz/site/dtds/service-config.xsd (original) +++ ofbiz/site/dtds/service-config.xsd Sat May 24 13:14:20 2014 @@ -18,253 +18,307 @@ specific language governing permissions under the License. --> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"> - <!-- ====================== Root Element ======================= --> + <xs:element name="service-config"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="1" maxOccurs="unbounded" ref="service-engine"/> + <xs:element minOccurs="1" maxOccurs="unbounded" ref="service-engine" /> </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="service-engine"> + <xs:annotation> + <xs:documentation> + A service engine configuration instance. The schema supports multiple configuration + instances, but the OFBiz framework supports only one - named "default". + </xs:documentation> + </xs:annotation> <xs:complexType> <xs:sequence> - <xs:element ref="authorization"/> - <xs:element ref="thread-pool"/> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="engine"/> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="service-location"/> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="notification-group"/> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="startup-service"/> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="resource-loader"/> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="global-services"/> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="service-groups"/> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="service-ecas"/> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="jms-service"/> + <xs:element ref="authorization" /> + <xs:element ref="thread-pool" /> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="engine" /> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="service-location" /> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="notification-group" /> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="startup-service" /> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="resource-loader" /> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="global-services" /> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="service-groups" /> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="service-ecas" /> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="jms-service" /> </xs:sequence> - <xs:attributeGroup ref="attlist.service-engine"/> + <xs:attribute name="name" type="xs:string" use="required" /> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.service-engine"> - <xs:attribute type="xs:string" name="name" use="required"/> - </xs:attributeGroup> + <xs:element name="authorization"> <xs:complexType> - <xs:attributeGroup ref="attlist.authorization"/> + <xs:attribute name="service-name" type="xs:string" use="required" /> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.authorization"> - <xs:attribute type="xs:string" name="service-name" use="required"/> - </xs:attributeGroup> + <xs:element name="thread-pool"> + <xs:annotation> + <xs:documentation> + Configures the Job Manager and Job Poller. + </xs:documentation> + </xs:annotation> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="run-from-pool"/> + <xs:element name="run-from-pool" minOccurs="0" maxOccurs="unbounded"> + <xs:annotation> + <xs:documentation> + The Job Pool(s) this server should service. Only valid when the + thread-pool element poll-enabled attribute is set to "true". + A database can contain any number of job pools, and different + servers can service different pools. Since the pools are in a common + (shared) database, there is the potential for database locking problems + when multiple servers service the pools. + </xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:attribute type="xs:string" name="name" use="required" /> + </xs:complexType> + </xs:element> </xs:sequence> - <xs:attributeGroup ref="attlist.thread-pool"/> + <xs:attribute name="send-to-pool" type="xs:string" use="required"> + <xs:annotation> + <xs:documentation> + The Job Pool that jobs originating on this server should be sent to. + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="purge-job-days" type="xs:nonNegativeInteger" default="30"> + <xs:annotation> + <xs:documentation> + The number of days to keep completed/canceled jobs in the database. + Only valid when the poll-enabled attribute is set to "true". + This value should be reduced for applications that create a lot of jobs. + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="failed-retry-min" type="xs:nonNegativeInteger" default="30"> + <xs:annotation> + <xs:documentation> + The number of minutes to wait before retrying a failed job. + Only valid when the poll-enabled attribute is set to "true". + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="ttl" type="xs:nonNegativeInteger"> + <xs:annotation> + <xs:documentation> + Idle queue service thread lifespan in milliseconds. Defaults to "120000" (2 minutes). + This setting should be a multiple of the poll-db-millis attribute value. If there are + no jobs after multiple database polls, then idle queue service threads should be + released - to help keep the system responsive. + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="jobs" type="xs:nonNegativeInteger"> + <xs:annotation> + <xs:documentation> + Job queue size. Defaults to "100". + The default setting is for "normal" installations. If an application generates a lot of jobs, + then this setting should be increased. If you are getting "Unable to queue job" + exceptions, then increase this setting gradually until the exceptions stop appearing. + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="min-threads" type="xs:nonNegativeInteger"> + <xs:annotation> + <xs:documentation> + Minimum number of queue service threads. Defaults to "1". + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="max-threads" type="xs:nonNegativeInteger"> + <xs:annotation> + <xs:documentation> + Maximum number of queue service threads. Defaults to "5". + The Job Poller will add jobs to the job queue until it is full, then it will add + queue service threads until the maximum in this setting is reached. The additional + queue service threads are released when they are idle for the period of time + set in the ttl attribute. + The default setting is for a server with two CPUs. The value can be increased + on servers with more CPUs. Higher values do not always result in better throughput - + additional threads can slow the server down because of thread maintenance overhead. + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="poll-enabled"> + <xs:annotation> + <xs:documentation> + Enable database polling. Defaults to "true". + In multi-server (load balanced) environments, only one server should have this + attribute set to "true" - otherwise you might experience database locking problems. + </xs:documentation> + </xs:annotation> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="true" /> + <xs:enumeration value="false" /> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="poll-db-millis" type="xs:nonNegativeInteger"> + <xs:annotation> + <xs:documentation> + Database polling interval in milliseconds. Defaults to "30000" (30 seconds). + Only valid when the poll-enabled attribute is set to "true". + When the database is polled, there will be a burst of activity (database "hits") + while the Job Manager queues jobs, then after the burst each queued job will + update the database after it runs. Decreasing this value will increase database activity. + Increasing this value will reduce the timeliness of job servicing. + </xs:documentation> + </xs:annotation> + </xs:attribute> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.thread-pool"> - <xs:attribute type="xs:string" name="send-to-pool" use="required"/> - <xs:attribute type="xs:nonNegativeInteger" name="purge-job-days" default="30"/> - <xs:attribute type="xs:nonNegativeInteger" name="failed-retry-min" default="30"/> - <xs:attribute type="xs:nonNegativeInteger" name="ttl" use="required"/> - <xs:attribute type="xs:nonNegativeInteger" name="wait-millis" use="required"/> - <xs:attribute type="xs:nonNegativeInteger" name="jobs" use="required"/> - <xs:attribute type="xs:nonNegativeInteger" name="min-threads" use="required"/> - <xs:attribute type="xs:nonNegativeInteger" name="max-threads" use="required"/> - <xs:attribute name="poll-enabled" default="true"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute type="xs:nonNegativeInteger" name="poll-db-millis" use="required"/> - </xs:attributeGroup> - <xs:element name="run-from-pool"> - <xs:complexType> - <xs:attributeGroup ref="attlist.run-from-pool"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.run-from-pool"> - <xs:attribute type="xs:string" name="name" use="required"/> - </xs:attributeGroup> + <xs:element name="engine"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="parameter"/> + <xs:element name="parameter" minOccurs="0" maxOccurs="unbounded"> + <xs:annotation> + <xs:documentation> + Parameters used by the engine. + </xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:attribute name="name" type="xs:string" use="required" /> + <xs:attribute name="value" type="xs:string" use="required" /> + </xs:complexType> + </xs:element> </xs:sequence> - <xs:attributeGroup ref="attlist.engine"/> - </xs:complexType> - </xs:element> - <xs:element name="parameter"> - <xs:annotation> - <xs:documentation> - Technical parameters use by engine - </xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:attributeGroup ref="attlist.parameter"/> + <xs:attribute name="name" type="xs:string" use="required" /> + <xs:attribute name="class" type="xs:string" use="required" /> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.parameter"> - <xs:attribute type="xs:string" name="name" use="required"/> - <xs:attribute type="xs:string" name="value" use="required"/> - </xs:attributeGroup> - <xs:attributeGroup name="attlist.engine"> - <xs:attribute type="xs:string" name="name" use="required"/> - <xs:attribute type="xs:string" name="class" use="required"/> - </xs:attributeGroup> + <xs:element name="startup-service"> <xs:complexType> - <xs:attributeGroup ref="attlist.startup-service"/> + <xs:attribute name="name" type="xs:string" use="required" /> + <xs:attribute name="runtime-data-id" type="xs:string" /> + <xs:attribute name="runtime-delay" type="xs:nonNegativeInteger" default="0" /> + <xs:attribute name="run-in-pool" type="xs:string" /> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.startup-service"> - <xs:attribute type="xs:string" name="name" use="required"/> - <xs:attribute type="xs:string" name="runtime-data-id"/> - <xs:attribute type="xs:nonNegativeInteger" name="runtime-delay" default="0"/> - <xs:attribute type="xs:string" name="run-in-pool"/> - </xs:attributeGroup> + <xs:element name="service-location"> <xs:complexType> - <xs:attributeGroup ref="attlist.service-location"/> + <xs:attribute name="name" type="xs:string" use="required" /> + <xs:attribute name="location" type="xs:string" use="required" /> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.service-location"> - <xs:attribute type="xs:string" name="name" use="required"/> - <xs:attribute type="xs:string" name="location" use="required"/> - </xs:attributeGroup> + <xs:element name="resource-loader"> <xs:complexType> - <xs:attributeGroup ref="attlist.resource-loader"/> + <xs:attribute name="name" type="xs:string" use="required" /> + <xs:attribute name="class" type="xs:string" use="required" /> + <xs:attribute name="prepend-env" type="xs:string" /> + <xs:attribute name="prefix" type="xs:string" /> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.resource-loader"> - <xs:attribute type="xs:string" name="name" use="required"/> - <xs:attribute type="xs:string" name="class" use="required"/> - <xs:attribute type="xs:string" name="prepend-env"/> - <xs:attribute type="xs:string" name="prefix"/> + + <xs:attributeGroup name="loader-and-location-required"> + <xs:attribute name="loader" type="xs:string" use="required" /> + <xs:attribute name="location" type="xs:string" use="required" /> </xs:attributeGroup> + <xs:element name="global-services"> <xs:complexType> - <xs:attributeGroup ref="attlist.global-services"/> + <xs:attributeGroup ref="loader-and-location-required"/> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.global-services"> - <xs:attribute type="xs:string" name="loader" use="required"/> - <xs:attribute type="xs:string" name="location" use="required"/> - </xs:attributeGroup> + <xs:element name="service-groups"> <xs:complexType> - <xs:attributeGroup ref="attlist.service-groups"/> + <xs:attributeGroup ref="loader-and-location-required"/> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.service-groups"> - <xs:attribute type="xs:string" name="loader" use="required"/> - <xs:attribute type="xs:string" name="location" use="required"/> - </xs:attributeGroup> + <xs:element name="service-ecas"> <xs:complexType> - <xs:attributeGroup ref="attlist.service-ecas"/> + <xs:attributeGroup ref="loader-and-location-required"/> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.service-ecas"> - <xs:attribute type="xs:string" name="loader" use="required"/> - <xs:attribute type="xs:string" name="location" use="required"/> - </xs:attributeGroup> + <xs:element name="jms-service"> <xs:complexType> <xs:sequence> - <xs:element maxOccurs="unbounded" ref="server"/> + <xs:element name="server" maxOccurs="unbounded"> + <xs:complexType> + <xs:attribute name="jndi-server-name" type="xs:string" use="required" /> + <xs:attribute name="jndi-name" type="xs:string" use="required" /> + <xs:attribute name="topic-queue" type="xs:string" use="required" /> + <xs:attribute name="type" use="required"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="topic" /> + <xs:enumeration value="queue" /> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="username" type="xs:string" /> + <xs:attribute name="password" type="xs:string" /> + <xs:attribute name="client-id" type="xs:string" /> + <xs:attribute name="listen" default="false"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="true" /> + <xs:enumeration value="false" /> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute type="xs:string" name="listener-class" /> + </xs:complexType> + </xs:element> </xs:sequence> - <xs:attributeGroup ref="attlist.jms-service"/> + <xs:attribute name="name" type="xs:string" use="required" /> + <xs:attribute name="send-mode" default="none"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="none" /> + <xs:enumeration value="all" /> + <xs:enumeration value="first-available" /> + <xs:enumeration value="random" /> + <xs:enumeration value="round-robin" /> + <xs:enumeration value="least-load" /> + </xs:restriction> + </xs:simpleType> + </xs:attribute> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.jms-service"> - <xs:attribute type="xs:string" name="name" use="required"/> - <xs:attribute name="send-mode" default="none"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="none"/> - <xs:enumeration value="all"/> - <xs:enumeration value="first-available"/> - <xs:enumeration value="random"/> - <xs:enumeration value="round-robin"/> - <xs:enumeration value="least-load"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:attributeGroup> - <xs:element name="server"> - <xs:complexType> - <xs:attributeGroup ref="attlist.server"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.server"> - <xs:attribute type="xs:string" name="jndi-server-name" use="required"/> - <xs:attribute type="xs:string" name="jndi-name" use="required"/> - <xs:attribute type="xs:string" name="topic-queue" use="required"/> - <xs:attribute name="type" use="required"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="topic"/> - <xs:enumeration value="queue"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute type="xs:string" name="username"/> - <xs:attribute type="xs:string" name="password"/> - <xs:attribute type="xs:string" name="client-id"/> - <xs:attribute name="listen" default="false"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute type="xs:string" name="listener-class"/> - </xs:attributeGroup> <xs:element name="notification-group"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="1" maxOccurs="1" ref="notification"/> - <xs:element minOccurs="2" maxOccurs="unbounded" ref="notify"/> + <xs:element name="notification" minOccurs="1" maxOccurs="1"> + <xs:complexType> + <xs:attribute name="subject" type="xs:string" use="required" /> + <xs:attribute name="screen" type="xs:string" use="required" /> + <xs:attribute name="service" type="xs:string" default="sendMailFromScreen" /> + </xs:complexType> + </xs:element> + <xs:element name="notify" minOccurs="2" maxOccurs="unbounded"> + <xs:complexType mixed="true"> + <xs:attribute name="type" use="required"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="to" /> + <xs:enumeration value="cc" /> + <xs:enumeration value="bcc" /> + <xs:enumeration value="from" /> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + </xs:complexType> + </xs:element> </xs:sequence> - <xs:attributeGroup ref="attlist.notification-group"/> + <xs:attribute name="name" type="xs:string" use="required" /> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.notification-group"> - <xs:attribute type="xs:string" name="name"/> - </xs:attributeGroup> - <xs:element name="notification"> - <xs:complexType> - <xs:attributeGroup ref="attlist.notification"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.notification"> - <xs:attribute type="xs:string" name="subject" use="required"/> - <xs:attribute type="xs:string" name="screen" use="required"/> - <xs:attribute type="xs:string" name="service" default="sendMailFromScreen"/> - </xs:attributeGroup> - <xs:element name="notify"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="attlist.notify"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.notify"> - <xs:attribute name="type" use="required"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="to"/> - <xs:enumeration value="cc"/> - <xs:enumeration value="bcc"/> - <xs:enumeration value="from"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:attributeGroup> + </xs:schema> Modified: ofbiz/site/dtds/services.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/services.xsd?rev=1597281&r1=1597280&r2=1597281&view=diff ============================================================================== --- ofbiz/site/dtds/services.xsd (original) +++ ofbiz/site/dtds/services.xsd Sat May 24 13:14:20 2014 @@ -106,6 +106,7 @@ under the License. If set to true and there is a transaction already in place the Service Engine will suspend that transaction, begin a new one just for this service, commit or rollback the local transaction when the service is complete, and will resume the original transaction. If set to true and there is no transaction already in place it will just begin a transaction and manage it as would be done for a normal user-transaction=true. If use-transaction=false this setting is ignored. + Beware: using require-new-transaction=true in a service called (maybe not directly) by a pre-invoke or earlier event ( preprocessor, firstvisit and so on) is not yet supported. </xs:documentation> </xs:annotation> <xs:simpleType> @@ -118,7 +119,7 @@ under the License. <xs:attribute name="hideResultInLog" default="false"> <xs:annotation> <xs:documentation> - If set to true the result will be hidden from possible exposition in ServiceDispatcher.runSync() + If set to true the result will be hidden from possible exposition in LocalDispatcher.runSync() </xs:documentation> </xs:annotation> <xs:simpleType> @@ -266,7 +267,7 @@ under the License. <xs:documentation> Calculate and maintain an average response time for this service. Service metrics can be used for monitoring and reporting. - <br/><br/> + The metric works by gathering statistics until a configurable maximum is reached (number of requests or elapsed time), then the average is calculated. A smoothing factor is used to smooth differences between calculations. @@ -348,11 +349,18 @@ under the License. </xs:simpleType> </xs:attribute> <xs:attribute name="allow-html" use="optional" default="none"> - <xs:annotation><xs:documentation>See the documentation on the allow-html attribute of the "attribute" element.</xs:documentation></xs:annotation> + <xs:annotation> + <xs:documentation> + Applies only to String fields. + Only checked for incoming parameters/attributes (could change in the future, but this is meant for validating input from users, other systems, etc). + Defaults to "none" meaning no HTML is allowed (will result in an error message). + If some HTML is desired then use "any". + There was previously "safe" but it's deprecated + </xs:documentation> + </xs:annotation> <xs:simpleType> <xs:restriction base="xs:token"> <xs:enumeration value="any"/> - <xs:enumeration value="safe"/> <xs:enumeration value="none"/> </xs:restriction> </xs:simpleType> @@ -396,11 +404,19 @@ under the License. </xs:simpleType> </xs:attribute> <xs:attribute name="default-value" type="xs:string"> - <xs:annotation><xs:documentation>The value specified will be used for the attribute if no value is passed in. This will only happen if it is okay to not pass a value in, so if this is set then optional will be set to true. If optional=false and this is set then the value will be overridden and with a value in default-value is will set optional=true anyway.</xs:documentation></xs:annotation> + <xs:annotation> + <xs:documentation>The value specified will be used for the attribute if no value is passed in. + This will only happen if it is okay to not pass a value in, so if this is set then optional will be set to true. + If optional=false and this is set then the value will be overridden and with a value in default-value is will set + optional=true anyway. + </xs:documentation> + </xs:annotation> </xs:attribute> <xs:attribute name="form-label" type="xs:string"/> <xs:attribute name="entity-name" type="xs:string"/> <xs:attribute name="field-name" type="xs:string"/> + <xs:attribute name="request-attribute-name" type="xs:string"/> + <xs:attribute name="session-attribute-name" type="xs:string"/> <xs:attribute name="string-map-prefix" type="xs:string"/> <xs:attribute name="string-list-suffix" type="xs:string"/> <xs:attribute name="form-display" default="true"> @@ -415,14 +431,13 @@ under the License. <xs:annotation><xs:documentation> Applies only to String fields. Only checked for incoming parameters/attributes (could change in the future, but this is meant for validating input from users, other systems, etc). - Defualts to "none" meaning no HTML is allowed (will result in an error message). - If some HTML is desired then use "safe" which will follow the rules in the antisamy-esapi.xml file. This should be safe for both internal and public users. - In rare cases when users are trusted or it is not a sensitive field the "any" option may be used to not check the HTML content at all. + Defaults to "none" meaning no HTML is allowed (will result in an error message). + If some HTML is desired then use "any". + There was previously "safe" but it's deprecated </xs:documentation></xs:annotation> <xs:simpleType> <xs:restriction base="xs:token"> <xs:enumeration value="any"/> - <xs:enumeration value="safe"/> <xs:enumeration value="none"/> </xs:restriction> </xs:simpleType> @@ -469,11 +484,18 @@ under the License. </xs:simpleType> </xs:attribute> <xs:attribute name="allow-html" use="optional"> - <xs:annotation><xs:documentation>See the documentation on the allow-html attribute of the "attribute" element. Note that it is slightly different here as there is no defualt.</xs:documentation></xs:annotation> + <xs:annotation> + <xs:documentation> + Applies only to String fields. + Only checked for incoming parameters/attributes (could change in the future, but this is meant for validating input from users, other systems, etc). + There is no default, "none" means no HTML is allowed (will result in an error message). + If some HTML is desired then use "any". + There was previously "safe" but it's deprecated + </xs:documentation> + </xs:annotation> <xs:simpleType> <xs:restriction base="xs:token"> <xs:enumeration value="any"/> - <xs:enumeration value="safe"/> <xs:enumeration value="none"/> </xs:restriction> </xs:simpleType> Modified: ofbiz/site/dtds/simple-methods.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/simple-methods.xsd?rev=1597281&r1=1597280&r2=1597281&view=diff ============================================================================== --- ofbiz/site/dtds/simple-methods.xsd (original) +++ ofbiz/site/dtds/simple-methods.xsd Sat May 24 13:14:20 2014 @@ -199,7 +199,7 @@ under the License. <xs:annotation> <xs:documentation> Is a logged in user (UserLogin object, or login.username and login.password Strings) required to run this method? - "true" or "false" (defauts to "true") + "true" or "false" (defaults to "true") </xs:documentation> </xs:annotation> <xs:simpleType> @@ -213,7 +213,7 @@ under the License. <xs:annotation> <xs:documentation> Create a transaction if none exists for this thread? - "true" or "false" (defauts to "true") + "true" or "false" (defaults to "true") </xs:documentation> </xs:annotation> <xs:simpleType> @@ -226,14 +226,14 @@ under the License. <xs:attribute type="xs:string" name="default-error-code" default="error"> <xs:annotation> <xs:documentation> - The default error return code. (defauts to "error") + The default error return code. (defaults to "error") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="default-success-code" default="success"> <xs:annotation> <xs:documentation> - The default success return code. (defauts to "success") + The default success return code. (defaults to "success") </xs:documentation> </xs:annotation> </xs:attribute> @@ -242,119 +242,119 @@ under the License. <xs:documentation> As event: copy of request parameters. As service: incoming context. - (defauts to "parameters") + (defaults to "parameters") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="event-request-object-name" default="request"> <xs:annotation> <xs:documentation> - As event only (defauts to "request") + As event only (defaults to "request") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="event-response-object-name" default="response"> <xs:annotation> <xs:documentation> - As event only (defauts to "response") + As event only (defaults to "response") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="event-response-code-name" default="_response_code_"> <xs:annotation> <xs:documentation> - As event only (defauts to "_response_code") + As event only (defaults to "_response_code") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="event-error-message-name" default="_error_message_"> <xs:annotation> <xs:documentation> - As event only (defauts to "_error_message_") + As event only (defaults to "_error_message_") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="event-event-message-name" default="_event_message_"> <xs:annotation> <xs:documentation> - As event only (defauts to "_event_message_") + As event only (defaults to "_event_message_") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="service-response-message-name" default="responseMessage"> <xs:annotation> <xs:documentation> - As service only (defauts to "responseMessage") + As service only (defaults to "responseMessage") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="service-error-message-name" default="errorMessage"> <xs:annotation> <xs:documentation> - As service only (defauts to "errorMessage") + As service only (defaults to "errorMessage") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="service-error-message-list-name" default="errorMessageList"> <xs:annotation> <xs:documentation> - As service only (defauts to "errorMessageList") + As service only (defaults to "errorMessageList") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="service-error-message-map-name" default="errorMessageMap"> <xs:annotation> <xs:documentation> - As service only (defauts to "errorMessageMap") + As service only (defaults to "errorMessageMap") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="service-success-message-name" default="successMessage"> <xs:annotation> <xs:documentation> - As service only (defauts to "successMessage") + As service only (defaults to "successMessage") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="service-success-message-list-name" default="successMessageList"> <xs:annotation> <xs:documentation> - As service only (defauts to "successMessageList") + As service only (defaults to "successMessageList") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="locale-name" default="locale"> <xs:annotation> <xs:documentation> - Name of locale variable (defauts to "locale") + Name of locale variable (defaults to "locale") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="delegator-name" default="delegator"> <xs:annotation> <xs:documentation> - A GenericDelegator object to use in the method (defauts to "delegator") + A GenericDelegator object to use in the method (defaults to "delegator") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="security-name" default="security"> <xs:annotation> <xs:documentation> - A Security object to use in the method (defauts to "security") + A Security object to use in the method (defaults to "security") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="dispatcher-name" default="dispatcher"> <xs:annotation> <xs:documentation> - A LocalDispatcher object to use in the method (defauts to "dispatcher") + A LocalDispatcher object to use in the method (defaults to "dispatcher") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="user-login-name" default="userLogin"> <xs:annotation> <xs:documentation> - Name of user login variable (defauts to "userLogin") + Name of user login variable (defaults to "userLogin") </xs:documentation> </xs:annotation> </xs:attribute> @@ -2990,7 +2990,8 @@ under the License. <xs:attribute name="do-cache-clear" default="true"> <xs:annotation> <xs:documentation> - Clear the cache, defaults to true + Clear the cache. Defaults to "true". + Deprecated - should always be true </xs:documentation> </xs:annotation> <xs:simpleType> @@ -3036,7 +3037,8 @@ under the License. <xs:attribute name="do-cache-clear" default="true"> <xs:annotation> <xs:documentation> - Clear the cache, defaults to true + Clear the cache. Defaults to "true". + Deprecated - should always be true </xs:documentation> </xs:annotation> <xs:simpleType> @@ -3101,7 +3103,8 @@ under the License. <xs:attribute name="do-cache-clear" default="true"> <xs:annotation> <xs:documentation> - Clear the cache, defaults to true + Clear the cache. Defaults to "true". + Deprecated - should always be true </xs:documentation> </xs:annotation> <xs:simpleType> @@ -3165,7 +3168,8 @@ under the License. <xs:attribute name="do-cache-clear" default="true"> <xs:annotation> <xs:documentation> - Clear the cache, defaults to true + Clear the cache. Defaults to "true". + Deprecated - should always be true </xs:documentation> </xs:annotation> <xs:simpleType> @@ -3205,7 +3209,8 @@ under the License. <xs:attribute name="do-cache-clear" default="true"> <xs:annotation> <xs:documentation> - Clear the cache, defaults to true + Clear the cache. Defaults to "true". + Deprecated - should always be true </xs:documentation> </xs:annotation> <xs:simpleType> @@ -3358,7 +3363,8 @@ under the License. <xs:attribute name="do-cache-clear" default="true"> <xs:annotation> <xs:documentation> - Clear the cache, defaults to true + Clear the cache. Defaults to "true". + Deprecated - should always be true </xs:documentation> </xs:annotation> <xs:simpleType> @@ -3391,7 +3397,8 @@ under the License. <xs:attribute name="do-cache-clear" default="true"> <xs:annotation> <xs:documentation> - Clear the cache, defaults to true + Clear the cache. Defaults to "true". + Deprecated - should always be true </xs:documentation> </xs:annotation> <xs:simpleType> Modified: ofbiz/site/dtds/site-conf.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/site-conf.xsd?rev=1597281&r1=1597280&r2=1597281&view=diff ============================================================================== --- ofbiz/site/dtds/site-conf.xsd (original) +++ ofbiz/site/dtds/site-conf.xsd Sat May 24 13:14:20 2014 @@ -25,6 +25,7 @@ under the License. <xs:element minOccurs="0" ref="description"/> <xs:element minOccurs="0" ref="owner"/> <xs:element minOccurs="0" ref="errorpage"/> + <xs:element minOccurs="0" ref="status-code"/> <xs:element minOccurs="0" maxOccurs="unbounded" ref="handler"/> <xs:element minOccurs="0" ref="protect"/> <xs:element minOccurs="0" ref="firstvisit"/> @@ -58,6 +59,17 @@ under the License. <xs:element name="description" type="xs:string"/> <xs:element name="owner" type="xs:string"/> <xs:element name="errorpage" type="xs:string"/> + <xs:element name="status-code" type="xs:string"> + <xs:annotation> + <xs:documentation> + A redirection HTTP status-code + If set it will override, for this whole controller, the default status-code sets in requestHandler.properties + + Most possible redirection status-codes are 301, 303 and 307. + 302 (the Java default) is not recommended for SEO reasons, 301 is preferred. + </xs:documentation> + </xs:annotation> + </xs:element> <xs:element name="handler"> <xs:annotation> <xs:documentation> @@ -326,7 +338,7 @@ under the License. <xs:attribute name="direct-request" default="true"> <xs:annotation> <xs:documentation> - If false the request can only be accessed in a chained request + If false the request can only be accessed in a chained request, default to true. </xs:documentation> </xs:annotation> <xs:simpleType> @@ -340,10 +352,10 @@ under the License. <xs:element name="metric"> <xs:annotation> <xs:documentation> - Calculate and maintain an average response time for this request. Request metrics can be used - for monitoring and reporting. Metrics can also be used to trigger an alternate + Calculate and maintain a moving average response time for a Request or Event. Request Metrics can be used + for monitoring and reporting, Event Metrics only for reporting. Request Metrics can also be used to trigger an alternate response if the optional threshold attribute is used. - <br/><br/> + The metric works by gathering statistics until a configurable maximum is reached (number of requests or elapsed time), then the average is calculated. A smoothing factor is used to smooth differences between calculations. @@ -400,6 +412,9 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" ref="metric"/> + </xs:sequence> <xs:attributeGroup ref="attlist.event"/> </xs:complexType> </xs:element> @@ -639,6 +654,18 @@ under the License. </xs:restriction> </xs:simpleType> </xs:attribute> + <xs:attribute name="status-code" type="xs:string"> + <xs:annotation> + <xs:documentation> + A redirection HTTP status-code + If set it will override, for this request, the default status-code sets in requestHandler.properties + and the possible status-code sets at the controller level (included controllers inclusive) + + Most possible redirection status-codes are 301, 303 and 307. + 302 (the Java default) is not recommended for SEO reasons, 301 is preferred. + </xs:documentation> + </xs:annotation> + </xs:attribute> </xs:attributeGroup> <xs:element name="redirect-parameter"> <xs:annotation> Modified: ofbiz/site/dtds/test-suite.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/test-suite.xsd?rev=1597281&r1=1597280&r2=1597281&view=diff ============================================================================== --- ofbiz/site/dtds/test-suite.xsd (original) +++ ofbiz/site/dtds/test-suite.xsd Sat May 24 13:14:20 2014 @@ -129,12 +129,4 @@ under the License. </xs:attribute> </xs:attributeGroup> - <xs:element name="jython-test" substitutionGroup="TestCaseTypes"> - <xs:complexType> - <xs:attributeGroup ref="attlist.jython-test"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.jython-test"> - <xs:attribute type="xs:string" name="script-location" use="required"/> - </xs:attributeGroup> </xs:schema> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |