From 39bd58c6e06d7763ca401f89f731db811b24a232 Mon Sep 17 00:00:00 2001
From: Jenkins CI <jenkins@davinti.com.br>
Date: Fri, 27 Mar 2026 20:03:59 +0000
Subject: [PATCH] Update XSDs for branch feature/git-content-stream-a - Build 1

---
 vitruvio-form-db-components.xsd | 1132 ++++++++++++++++---------------
 vitruvio-form-widgets.xsd       |   30 +
 vitruvio-mobile-base-form.xsd   |    1 +
 vitruvio-mobile-form.xsd        |  299 ++++----
 vitruvio-mobile-widgets.xsd     |  233 ++++---
 5 files changed, 919 insertions(+), 776 deletions(-)

diff --git a/vitruvio-form-db-components.xsd b/vitruvio-form-db-components.xsd
index 98c671f..a508a8d 100644
--- a/vitruvio-form-db-components.xsd
+++ b/vitruvio-form-db-components.xsd
@@ -1,274 +1,301 @@
 <?xml version="1.0"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
 
-<!-- Parametros comuns nos Campos -->
-<xs:include schemaLocation="vitruvio-form-common-attrs.xsd" />
-<xs:include schemaLocation="vitruvio-form-field-validators.xsd" />
-<xs:include schemaLocation="vitruvio-form-field-events.xsd" />
+	<!-- Parametros comuns nos Campos -->
+	<xs:include schemaLocation="vitruvio-form-common-attrs.xsd" />
+	<xs:include schemaLocation="vitruvio-form-field-validators.xsd" />
+	<xs:include schemaLocation="vitruvio-form-field-events.xsd" />
 
-<!-- 
+	<!-- 
 	Componentes com datasources sql
 -->
- 
-<!-- Datasource para uso de Querys Livres, com Input local -->
-<xs:complexType name="freeDataSource">
-	<xs:simpleContent>
+
+	<!-- Datasource para uso de Querys Livres, com Input local -->
+	<xs:complexType name="freeDataSource">
+		<xs:simpleContent>
 			<xs:extension base="xs:string">
 				<xs:attribute name="connection-key" type="xs:string" use="required" />
 			</xs:extension>
-	</xs:simpleContent>
-</xs:complexType>
+		</xs:simpleContent>
+	</xs:complexType>
 
-<!-- Datasource para uso de Querys mapeadas pre cadastradas no Vitruvio -->
-<xs:complexType name="queryDataSource">
-	<xs:attribute name="key" type="xs:string" use="required" />
-</xs:complexType> 
+	<xs:complexType name="formRefDataSource">
+		<xs:annotation>
+			<xs:documentation>
+				Datasource para consumir datasources definidos no formulário.
+			</xs:documentation>
+		</xs:annotation>
+		<xs:attribute name="ref" type="xs:string" use="required" />
+	</xs:complexType>
 
-<xs:complexType name="sqlBuilderScript">
-	<xs:complexContent>
-		<xs:extension base="base-script">
-			<xs:attribute name="connection-key" type="xs:string" use="required" />
-		</xs:extension>
-	</xs:complexContent>
-</xs:complexType>
+	<!-- Datasource para uso de Querys mapeadas pre cadastradas no Vitruvio -->
+	<xs:complexType name="queryDataSource">
+		<xs:attribute name="key" type="xs:string" use="required" />
+	</xs:complexType>
 
-<xs:attributeGroup name="value-caption-attrs">
-	<xs:attribute name="key-field" use="required" type="xs:string" />
-	<xs:attribute name="caption-field" type="xs:string" />
-</xs:attributeGroup>
+	<xs:complexType name="sqlBuilderScript">
+		<xs:complexContent>
+			<xs:extension base="base-script">
+				<xs:attribute name="connection-key" type="xs:string" use="required" />
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
 
-<!-- Datasource comum aos objetos DB -->
-<xs:attributeGroup name="datasource-basic-attrs">
-	<xs:attribute name="pagination-strategy">
-		<xs:simpleType>
-			<xs:restriction base="xs:string">
-				<xs:enumeration value="SUB_QUERY_COUNT" />
-				<xs:enumeration value="IN_MEMORY" />
-			</xs:restriction>
-		</xs:simpleType>
-	</xs:attribute>
-	<xs:attribute name="fetchSize" type="xs:positiveInteger" use="optional" />
-	<xs:attribute name="maxFetchSize" type="xs:positiveInteger" use="optional" />
-</xs:attributeGroup>
-<xs:complexType name="datasource">
-	<xs:choice>
-		<xs:element name="freeQuery" type="freeDataSource" />
-		<xs:element name="query" type="queryDataSource" />
-	</xs:choice>
-	<xs:attributeGroup ref="datasource-basic-attrs" />
-</xs:complexType>
+	<xs:attributeGroup name="value-caption-attrs">
+		<xs:attribute name="key-field" use="required" type="xs:string" />
+		<xs:attribute name="caption-field" type="xs:string" />
+	</xs:attributeGroup>
 
-<!-- SQLBuilder DataSource -->
-<xs:complexType name="datasource-with-builder">
-	<xs:choice>
-		<xs:element name="freeQuery" type="freeDataSource" />
-		<xs:element name="query" type="queryDataSource" />
-		<xs:element name="sqlBuilderDataSource" type="sqlBuilderScript" />
-	</xs:choice>
-	<xs:attributeGroup ref="datasource-basic-attrs" />
-</xs:complexType>
+	<!-- Datasource comum aos objetos DB -->
+	<xs:attributeGroup name="datasource-basic-attrs">
+		<xs:attribute name="pagination-strategy">
+			<xs:simpleType>
+				<xs:restriction base="xs:string">
+					<xs:enumeration value="SUB_QUERY_COUNT" />
+					<xs:enumeration value="IN_MEMORY" />
+				</xs:restriction>
+			</xs:simpleType>
+		</xs:attribute>
+		<xs:attribute name="fetchSize" type="xs:positiveInteger" use="optional" />
+		<xs:attribute name="maxFetchSize" type="xs:positiveInteger" use="optional" />
+	</xs:attributeGroup>
+	<xs:complexType name="datasource">
+		<xs:choice>
+			<xs:element name="freeQuery" type="freeDataSource" />
+			<xs:element name="query" type="queryDataSource" />
+		</xs:choice>
+		<xs:attributeGroup ref="datasource-basic-attrs" />
+	</xs:complexType>
 
-<!-- Full datasource, incluindo datasource via script -->
-<xs:complexType name="fullDatasource">
-	<xs:choice>
-		<xs:element name="freeQuery" type="freeDataSource" />
-		<xs:element name="query" type="queryDataSource" />
-		<xs:element name="scriptDataSource" type="script" />
-	</xs:choice>
-</xs:complexType>
+	<xs:group name="DatasourceWithBuilderOptions">
+		<xs:choice>
+			<xs:element name="freeQuery" type="freeDataSource" />
+			<xs:element name="query" type="queryDataSource" />
+			<xs:element name="sqlBuilderDataSource" type="sqlBuilderScript" />
+		</xs:choice>
+	</xs:group>
 
-<!-- DB Property Field -->
-<xs:complexType name="DBPropertyField">
-	<xs:sequence>
-		<xs:element name="loadQuery" type="freeDataSource" minOccurs="1" maxOccurs="1" />
-		<xs:element name="caption-field" type="xs:string" minOccurs="1" maxOccurs="1" />
-		<xs:element name="bind" type="bindInfo" />
-		<xs:element name="validation" type="scriptValidators" minOccurs="0" maxOccurs="1" />
-		<xs:element name="events" type="allEvents" minOccurs="0" maxOccurs="1" />
-	</xs:sequence>
-	<xs:attribute name="modelMember" type="xs:boolean" fixed="false" use="required" />
-	<xs:attribute name="rows" type="xs:positiveInteger" />
-	<xs:attributeGroup ref="fieldAttrs" />
-</xs:complexType>
+	<!-- SQLBuilder DataSource -->
+	<xs:complexType name="datasource-with-builder">
+		<xs:choice>
+			<xs:group ref="DatasourceWithBuilderOptions"></xs:group>
+		</xs:choice>
+		<xs:attributeGroup ref="datasource-basic-attrs" />
+	</xs:complexType>
 
-<!-- Componentes DB suportam multiplos Binds -->
-<xs:complexType name="DBMultiBind">
-	<xs:sequence minOccurs="1" maxOccurs="unbounded">
+	<!-- Full datasource, incluindo datasource via script -->
+	<xs:complexType name="fullDatasource">
 		<xs:choice>
-			<xs:element name="field">
+			<xs:element name="freeQuery" type="freeDataSource" />
+			<xs:element name="query" type="queryDataSource" />
+			<xs:element name="scriptDataSource" type="script" />
+		</xs:choice>
+	</xs:complexType>
+
+	<!-- DB Property Field -->
+	<xs:complexType name="DBPropertyField">
+		<xs:sequence>
+			<xs:element name="loadQuery" type="freeDataSource" minOccurs="1" maxOccurs="1" />
+			<xs:element name="caption-field" type="xs:string" minOccurs="1" maxOccurs="1" />
+			<xs:element name="bind" type="bindInfo" />
+			<xs:element name="validation" type="scriptValidators" minOccurs="0" maxOccurs="1" />
+			<xs:element name="events" type="allEvents" minOccurs="0" maxOccurs="1" />
+		</xs:sequence>
+		<xs:attribute name="modelMember" type="xs:boolean" fixed="false" use="required" />
+		<xs:attribute name="rows" type="xs:positiveInteger" />
+		<xs:attributeGroup ref="fieldAttrs" />
+	</xs:complexType>
+
+	<!-- Componentes DB suportam multiplos Binds -->
+	<xs:complexType name="DBMultiBind">
+		<xs:sequence minOccurs="1" maxOccurs="unbounded">
+			<xs:choice>
+				<xs:element name="field">
+					<xs:complexType>
+						<xs:attribute name="ref" type="xs:string" use="required" />
+						<xs:attribute name="propertyName" type="xs:string" use="required" />
+					</xs:complexType>
+				</xs:element>
+				<xs:element name="parameter">
+					<xs:complexType>
+						<xs:attribute name="field-ref" type="xs:string" use="optional" />
+						<xs:attribute name="context-value" use="optional">
+							<xs:simpleType>
+								<xs:restriction base="xs:string">
+									<xs:enumeration value="PROCESS_INSTANCE_ID" />
+									<xs:enumeration value="PROCESS_BUSINESS_KEY" />
+									<xs:enumeration value="TASK_ID" />
+									<xs:enumeration value="USER_LOGIN" />
+									<xs:enumeration value="USER_COMPANYS" />
+								</xs:restriction>
+							</xs:simpleType>
+						</xs:attribute>
+						<xs:attribute name="parameterName" type="xs:string" use="required" />
+						<xs:attribute name="defaultValue" type="xs:string" use="required" />
+						<xs:attributeGroup ref="value-type-enum" />
+					</xs:complexType>
+				</xs:element>
+			</xs:choice>
+		</xs:sequence>
+		<xs:attribute name="refreshOnChange" type="xs:boolean" />
+	</xs:complexType>
+
+	<!-- Database combobox -->
+	<xs:complexType name="DBComboBox">
+		<xs:sequence>
+			<xs:element name="datasource" type="datasource-with-builder" minOccurs="1" maxOccurs="1" />
+			<xs:element name="key-field" type="xs:string" minOccurs="1" maxOccurs="1" />
+			<xs:element name="caption-field" type="xs:string" minOccurs="0" maxOccurs="1" />
+			<xs:element name="bind" type="DBMultiBind" minOccurs="0" maxOccurs="1" />
+			<xs:element name="validation" type="scriptValidators" minOccurs="0" maxOccurs="1" />
+			<xs:element name="events" type="allEvents" minOccurs="0" maxOccurs="1" />
+		</xs:sequence>
+		<xs:attribute name="multivalue" type="xs:boolean" />
+		<xs:attribute name="multivalue-show-clear-button" type="xs:boolean" />
+		<xs:attribute name="multivalue-clear-button-caption" type="xs:boolean" />
+		<xs:attributeGroup ref="fieldAttrs" />
+		<xs:attributeGroup ref="selectFieldAttr" />
+		<xs:attributeGroup ref="companyDefinitionAttrs" />
+		<xs:attributeGroup ref="personDefinitionAttrs" />
+		<xs:attributeGroup ref="tagFieldAttrs" />
+	</xs:complexType>
+
+	<xs:complexType name="DBTwinColSelect">
+		<xs:sequence>
+			<xs:element name="datasource" type="datasource-with-builder" minOccurs="1" maxOccurs="1" />
+			<xs:element name="key-field" type="xs:string" minOccurs="1" maxOccurs="1" />
+			<xs:element name="caption-field" type="xs:string" minOccurs="0" maxOccurs="1" />
+			<xs:element name="bind" type="DBMultiBind" minOccurs="0" maxOccurs="1" />
+			<xs:element name="validation" type="scriptValidators" minOccurs="0" maxOccurs="1" />
+			<xs:element name="events" type="allEvents" minOccurs="0" maxOccurs="1" />
+		</xs:sequence>
+		<xs:attribute name="multivalue" type="xs:boolean" fixed="true" use="required" />
+		<xs:attribute name="leftCaption" type="xs:string" />
+		<xs:attribute name="rightCaption" type="xs:string" />
+		<xs:attribute name="allowFilter" type="xs:boolean" />
+		<xs:attribute name="rows" type="xs:positiveInteger" />
+		<xs:attribute name="requireFilter" type="xs:boolean" />
+		<xs:attribute name="maxSelectedItens" type="xs:positiveInteger" />
+		<xs:attributeGroup ref="fieldAttrs" />
+		<xs:attributeGroup ref="selectFieldAttr" />
+	</xs:complexType>
+
+	<xs:complexType name="DBTableColumns">
+		<xs:sequence>
+			<xs:element name="column" minOccurs="1" maxOccurs="unbounded">
 				<xs:complexType>
-					<xs:attribute name="ref" type="xs:string" use="required" />
-					<xs:attribute name="propertyName" type="xs:string" use="required" />
+					<xs:attribute name="name" type="xs:string" use="required" />
+					<xs:attribute name="caption" type="xs:string" />
+					<xs:attribute name="expand-ratio" type="xs:double" />
+					<xs:attribute name="format" type="xs:string" />
 				</xs:complexType>
 			</xs:element>
-			<xs:element name="parameter">
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="DBSortColumn">
+		<xs:sequence>
+			<xs:element name="column" minOccurs="1" maxOccurs="unbounded">
 				<xs:complexType>
-					<xs:attribute name="field-ref" type="xs:string" use="optional" />
-					<xs:attribute name="context-value" use="optional" >
+					<xs:attribute name="name" type="xs:string" use="required" />
+					<xs:attribute name="order">
 						<xs:simpleType>
 							<xs:restriction base="xs:string">
-								<xs:enumeration value="PROCESS_INSTANCE_ID" />
-								<xs:enumeration value="PROCESS_BUSINESS_KEY" />
-								<xs:enumeration value="TASK_ID" />
-								<xs:enumeration value="USER_LOGIN" />
-								<xs:enumeration value="USER_COMPANYS" />
+								<xs:enumeration value="ASC" />
+								<xs:enumeration value="DESC" />
 							</xs:restriction>
 						</xs:simpleType>
 					</xs:attribute>
-					<xs:attribute name="parameterName" type="xs:string" use="required" />
-					<xs:attribute name="defaultValue" type="xs:string" use="required" />
-					<xs:attributeGroup ref="value-type-enum" />
 				</xs:complexType>
 			</xs:element>
-		</xs:choice>
-	</xs:sequence>
-	<xs:attribute name="refreshOnChange" type="xs:boolean" />
-</xs:complexType>
-
-<!-- Database combobox -->
-<xs:complexType name="DBComboBox">
-	<xs:sequence>
-		<xs:element name="datasource" type="datasource-with-builder" minOccurs="1" maxOccurs="1" />
-		<xs:element name="key-field" type="xs:string" minOccurs="1" maxOccurs="1" />
-		<xs:element name="caption-field" type="xs:string" minOccurs="0" maxOccurs="1" />
-		<xs:element name="bind" type="DBMultiBind" minOccurs="0" maxOccurs="1" />
-		<xs:element name="validation" type="scriptValidators" minOccurs="0" maxOccurs="1" />
-		<xs:element name="events" type="allEvents" minOccurs="0" maxOccurs="1" />
-	</xs:sequence>
-	<xs:attribute name="multivalue" type="xs:boolean" />
-	<xs:attribute name="multivalue-show-clear-button" type="xs:boolean" />
-	<xs:attribute name="multivalue-clear-button-caption" type="xs:boolean" />
-	<xs:attributeGroup ref="fieldAttrs" />
-	<xs:attributeGroup ref="selectFieldAttr" />
-	<xs:attributeGroup ref="companyDefinitionAttrs" />
-	<xs:attributeGroup ref="personDefinitionAttrs" />
-	<xs:attributeGroup ref="tagFieldAttrs" />
-</xs:complexType>
-
-<xs:complexType name="DBTwinColSelect">
-	<xs:sequence>
-		<xs:element name="datasource" type="datasource-with-builder" minOccurs="1" maxOccurs="1" />
-		<xs:element name="key-field" type="xs:string" minOccurs="1" maxOccurs="1" />
-		<xs:element name="caption-field" type="xs:string" minOccurs="0" maxOccurs="1" />
-		<xs:element name="bind" type="DBMultiBind" minOccurs="0" maxOccurs="1" />
-		<xs:element name="validation" type="scriptValidators" minOccurs="0" maxOccurs="1" />
-		<xs:element name="events" type="allEvents" minOccurs="0" maxOccurs="1" />
-	</xs:sequence>
-	<xs:attribute name="multivalue" type="xs:boolean" fixed="true" use="required" />
-	<xs:attribute name="leftCaption" type="xs:string" />
-	<xs:attribute name="rightCaption" type="xs:string" />
-	<xs:attribute name="allowFilter" type="xs:boolean" />
-	<xs:attribute name="rows" type="xs:positiveInteger" />
-	<xs:attribute name="requireFilter" type="xs:boolean" />
-	<xs:attribute name="maxSelectedItens" type="xs:positiveInteger" /> 
-	<xs:attributeGroup ref="fieldAttrs" />
-	<xs:attributeGroup ref="selectFieldAttr" />
-</xs:complexType>
-
-<xs:complexType name="DBTableColumns">
-	<xs:sequence>
-		<xs:element name="column" minOccurs="1" maxOccurs="unbounded">
-			<xs:complexType>
-				<xs:attribute name="name" type="xs:string" use="required" />
-				<xs:attribute name="caption" type="xs:string" />
-				<xs:attribute name="expand-ratio" type="xs:double" />
-				<xs:attribute name="format" type="xs:string" />
-			</xs:complexType>
-		</xs:element>
-	</xs:sequence>
-</xs:complexType>
+		</xs:sequence>
+	</xs:complexType>
 
-<xs:complexType name="DBSortColumn">
-	<xs:sequence>
-		<xs:element name="column" minOccurs="1" maxOccurs="unbounded">
-			<xs:complexType>
-				<xs:attribute name="name" type="xs:string" use="required" />
-				<xs:attribute name="order">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:enumeration value="ASC" />
-							<xs:enumeration value="DESC" />
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:complexType>
-		</xs:element>
-	</xs:sequence>
-</xs:complexType>
+	<!-- Tipo reutilizavel que representa uma coluna de um dbfilter dinamico -->
+	<xs:complexType name="DBFilterColumn">
+		<xs:attribute name="caption" type="xs:string" use="required" />
+		<xs:attribute name="filterBy" type="xs:string" />
+		<xs:attribute name="typeFilterBy">
+			<xs:simpleType>
+				<xs:restriction base="xs:string">
+					<xs:enumeration value="string" />
+					<xs:enumeration value="number" />
+					<xs:enumeration value="decimal" />
+					<xs:enumeration value="date" />
+				</xs:restriction>
+			</xs:simpleType>
+		</xs:attribute>
+		<xs:attribute name="filterType" type="xs:string" />
+		<xs:attribute name="connectionKey" type="xs:string" />
+	</xs:complexType>
 
-<!-- Tipo reutilizavel que representa uma coluna de um dbfilter dinamico -->
-<xs:complexType name="DBFilterColumn">
-	<xs:attribute name="caption" type="xs:string" use="required" />
-	<xs:attribute name="filterBy" type="xs:string" />
-	<xs:attribute name="typeFilterBy">
-		<xs:simpleType>
-			<xs:restriction base="xs:string">
-      			<xs:enumeration value="string"/>
-      			<xs:enumeration value="number"/>
-      			<xs:enumeration value="decimal"/>
-      			<xs:enumeration value="date"/>
-    		</xs:restriction>		
-		</xs:simpleType>
-	</xs:attribute>
-	<xs:attribute name="filterType" type="xs:string" />
-	<xs:attribute name="connectionKey" type="xs:string" />
-</xs:complexType>
+	<!-- Tipo reutilizavel que representa uma coluna de uma tabela -->
+	<xs:complexType name="DBTableColumn">
+		<xs:attribute name="name" type="xs:string" use="required" />
+		<xs:attribute name="caption" type="xs:string" />
+		<xs:attribute name="expand-ratio" type="xs:double" />
+		<xs:attribute name="format" type="xs:string" />
+		<xs:attribute name="filter" type="xs:boolean" />
+		<xs:attribute name="decimalSeparator" type="xs:string" />
+		<xs:attribute name="groupingSeparator" type="xs:string" />
+		<xs:attribute name="useGroupingSeparator" type="xs:boolean" />
+	</xs:complexType>
 
-<!-- Tipo reutilizavel que representa uma coluna de uma tabela -->
-<xs:complexType name="DBTableColumn">
-	<xs:attribute name="name" type="xs:string" use="required" />
-	<xs:attribute name="caption" type="xs:string" />
-	<xs:attribute name="expand-ratio" type="xs:double" />
-	<xs:attribute name="format" type="xs:string" />
-	<xs:attribute name="filter" type="xs:boolean" />
-	<xs:attribute name="decimalSeparator" type="xs:string" />
-	<xs:attribute name="groupingSeparator" type="xs:string" />
-	<xs:attribute name="useGroupingSeparator" type="xs:boolean" />
-</xs:complexType>
- 
-<xs:complexType name="DBTableEvents">
-	<xs:sequence minOccurs="1" maxOccurs="unbounded">
-		<xs:choice>
-			<xs:element name="valueChange" type="ScriptEvent" />
-			<xs:element name="itemChange" type="ScriptEvent" />
-			<xs:element name="itemClick">
-				<xs:complexType>
-				        <xs:sequence>
-				                <xs:element name="script" type="script" />
-				        </xs:sequence>
-				        <xs:attribute name="allowDoubleClick" type="xs:boolean" />
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="editFieldCreateListener">
-				<xs:complexType>
-				        <xs:sequence>
-				                <xs:element name="script" type="script" />
-				        </xs:sequence>
-				        <xs:attribute name="allowItemChangeEvent" type="xs:boolean" />
-				</xs:complexType>
-			</xs:element>
-		</xs:choice>
-	</xs:sequence>
-</xs:complexType>
+	<xs:complexType name="DBTableEvents">
+		<xs:sequence minOccurs="1" maxOccurs="unbounded">
+			<xs:choice>
+				<xs:element name="valueChange" type="ScriptEvent" />
+				<xs:element name="itemChange" type="ScriptEvent" />
+				<xs:element name="itemClick">
+					<xs:complexType>
+						<xs:sequence>
+							<xs:element name="script" type="script" />
+						</xs:sequence>
+						<xs:attribute name="allowDoubleClick" type="xs:boolean" />
+					</xs:complexType>
+				</xs:element>
+				<xs:element name="editFieldCreateListener">
+					<xs:complexType>
+						<xs:sequence>
+							<xs:element name="script" type="script" />
+						</xs:sequence>
+						<xs:attribute name="allowItemChangeEvent" type="xs:boolean" />
+					</xs:complexType>
+				</xs:element>
+			</xs:choice>
+		</xs:sequence>
+	</xs:complexType>
 
-<xs:attributeGroup name="DBTableDefaultColumnAttrs">
-	<xs:attribute name="expand-ratio" type="xs:double" />
-	<xs:attribute name="width" type="xs:positiveInteger" />
-	<xs:attribute name="hidable" type="xs:boolean" />
-	<xs:attribute name="filter" type="xs:boolean" />
-	<xs:attribute name="filterType" type="xs:string" />
-	<xs:attribute name="align" use="optional" >
-		<xs:simpleType>
-			<xs:restriction base="xs:string">
-				<xs:enumeration value="LEFT" />
-				<xs:enumeration value="CENTER" />
-				<xs:enumeration value="RIGHT" />
-			</xs:restriction>
-		</xs:simpleType>
-	</xs:attribute>
-</xs:attributeGroup>
+	<xs:attributeGroup name="DBTableDefaultColumnAttrs">
+		<xs:attribute name="expand-ratio" type="xs:double" />
+		<xs:attribute name="width" type="xs:positiveInteger" />
+		<xs:attribute name="hidable" type="xs:boolean" />
+		<xs:attribute name="filter" type="xs:boolean" />
+		<xs:attribute name="filterType" type="xs:string" />
+		<xs:attribute name="align" use="optional">
+			<xs:simpleType>
+				<xs:restriction base="xs:string">
+					<xs:enumeration value="LEFT" />
+					<xs:enumeration value="CENTER" />
+					<xs:enumeration value="RIGHT" />
+				</xs:restriction>
+			</xs:simpleType>
+		</xs:attribute>
+		<xs:attribute name="type" use="optional">
+			<xs:simpleType>
+				<xs:restriction base="xs:string">
+					<xs:enumeration value="STRING" />
+					<xs:enumeration value="DECIMAL" />
+					<xs:enumeration value="NUMBER" />
+					<xs:enumeration value="BOOLEAN" />
+					<xs:enumeration value="DATE" />
+					<xs:enumeration value="TIMESTAMP" />
+				</xs:restriction>
+			</xs:simpleType>
+		</xs:attribute>
+	</xs:attributeGroup>
 
-<xs:attributeGroup name="DBTableValueColumnBase">
+	<xs:attributeGroup name="DBTableValueColumnBase">
 		<xs:attribute name="format" type="xs:string" />
 		<xs:attribute name="editable" type="xs:boolean" />
 		<xs:attribute name="editMask" type="xs:string" />
@@ -291,329 +318,342 @@
 		</xs:attribute>
 		<xs:attribute name="aggregatePrefix" type="xs:string" />
 		<xs:attribute name="sortable" type="xs:boolean" />
-</xs:attributeGroup>
+	</xs:attributeGroup>
 
-<!-- Componente de selecao representado por uma tabela (GRID) -->
-<xs:complexType name="DBTable">
-	<xs:sequence>
-		<xs:element name="datasource" type="datasource-with-builder" minOccurs="1" maxOccurs="1" />
-		<xs:element name="key-field" type="xs:string" minOccurs="1" maxOccurs="1" />
-		<xs:element name="header-caption" type="xs:string" minOccurs="0" maxOccurs="1" />
-		<xs:element name="header-css-style" type="xs:string" minOccurs="0" maxOccurs="1" />
-		<xs:element name="columns" minOccurs="0" maxOccurs="1">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:choice minOccurs="0" maxOccurs="unbounded">
-						<xs:element name="column">
+	<!-- Componente de selecao representado por uma tabela (GRID) -->
+	<xs:complexType name="DBTable">
+		<xs:sequence>
+			<xs:element name="datasource" type="datasource-with-builder" minOccurs="1" maxOccurs="1" />
+			<xs:element name="key-field" type="xs:string" minOccurs="1" maxOccurs="1" />
+			<xs:element name="header-caption" type="xs:string" minOccurs="0" maxOccurs="1" />
+			<xs:element name="header-css-style" type="xs:string" minOccurs="0" maxOccurs="1" />
+			<xs:element name="columns" minOccurs="0" maxOccurs="1">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:choice minOccurs="0" maxOccurs="unbounded">
+							<xs:element name="column">
+								<xs:complexType>
+									<xs:attribute name="name" type="xs:string" use="required" />
+									<xs:attribute name="caption" type="xs:string" />
+									<xs:attributeGroup ref="DBTableValueColumnBase" />
+									<xs:attributeGroup ref="DBTableDefaultColumnAttrs" />
+								</xs:complexType>
+							</xs:element>
+							<xs:element name="dynamicColumn">
+								<xs:complexType>
+									<xs:attribute name="matchColumnTag" type="xs:string"
+										use="required" />
+									<xs:attribute name="removeTagInCaption" type="xs:boolean" />
+									<xs:attribute name="matchColumnBy">
+										<xs:simpleType>
+											<xs:restriction base="xs:string">
+												<xs:enumeration value="STARTS_WITH" />
+												<xs:enumeration value="ENDS_WITH" />
+											</xs:restriction>
+										</xs:simpleType>
+									</xs:attribute>
+									<xs:attributeGroup ref="DBTableValueColumnBase" />
+									<xs:attributeGroup ref="DBTableDefaultColumnAttrs" />
+								</xs:complexType>
+							</xs:element>
+							<xs:element name="generated">
+								<xs:complexType>
+									<xs:choice>
+										<xs:element name="scriptColumnGenerator" type="script"
+											minOccurs="1" maxOccurs="1" />
+									</xs:choice>
+									<xs:attribute name="name" type="xs:string" use="required" />
+									<xs:attribute name="caption" type="xs:string" />
+									<xs:attribute name="cache" type="xs:boolean" />
+									<xs:attribute name="columnForExport" type="xs:string" />
+									<xs:attributeGroup ref="DBTableDefaultColumnAttrs" />
+								</xs:complexType>
+							</xs:element>
+						</xs:choice>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="fixed-order-by" minOccurs="0" maxOccurs="1">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="prefix" minOccurs="0" maxOccurs="1">
 							<xs:complexType>
-								<xs:attribute name="name" type="xs:string" use="required" />
-								<xs:attribute name="caption" type="xs:string" />
-								<xs:attributeGroup ref="DBTableValueColumnBase" />
-								<xs:attributeGroup ref="DBTableDefaultColumnAttrs" />
+								<xs:sequence>
+									<xs:element name="column" type="DBSortColumn" minOccurs="1"
+										maxOccurs="unbounded" />
+								</xs:sequence>
 							</xs:complexType>
 						</xs:element>
-						<xs:element name="dynamicColumn">
+						<xs:element name="suffix" minOccurs="0" maxOccurs="1">
 							<xs:complexType>
-								<xs:attribute name="matchColumnTag" type="xs:string" use="required" />
-								<xs:attribute name="removeTagInCaption" type="xs:boolean" />
-								<xs:attribute name="matchColumnBy">
-									<xs:simpleType>
-										<xs:restriction base="xs:string">
-											<xs:enumeration value="STARTS_WITH" />
-											<xs:enumeration value="ENDS_WITH" />
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:attribute>
-								<xs:attributeGroup ref="DBTableValueColumnBase" />
-								<xs:attributeGroup ref="DBTableDefaultColumnAttrs" />
+								<xs:sequence>
+									<xs:element name="column" type="DBSortColumn" minOccurs="1"
+										maxOccurs="unbounded" />
+								</xs:sequence>
 							</xs:complexType>
 						</xs:element>
-						<xs:element name="generated">
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="bind" type="DBMultiBind" minOccurs="0" maxOccurs="1" />
+			<xs:element name="events" type="DBTableEvents" minOccurs="0" maxOccurs="1" />
+			<xs:element name="styleGenerator" minOccurs="0" maxOccurs="1">
+				<xs:complexType>
+					<xs:choice>
+						<xs:element name="scriptGenerator" type="script" minOccurs="1" maxOccurs="1" />
+					</xs:choice>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="editableFieldsGenerator" minOccurs="0" maxOccurs="1">
+				<xs:complexType>
+					<xs:choice>
+						<xs:element name="scriptGenerator" type="script" minOccurs="1" maxOccurs="1" />
+					</xs:choice>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="cellDescriptionGenerator" minOccurs="0" maxOccurs="1">
+				<xs:complexType>
+					<xs:choice>
+						<xs:element name="scriptGenerator" type="script" minOccurs="1" maxOccurs="1" />
+					</xs:choice>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="menuGenerator" minOccurs="0" maxOccurs="1">
+				<xs:complexType>
+					<xs:choice minOccurs="0" maxOccurs="1">
+						<xs:element name="staticMenuGenerator" minOccurs="1" maxOccurs="1">
 							<xs:complexType>
-								<xs:choice>
-									<xs:element name="scriptColumnGenerator" type="script" minOccurs="1" maxOccurs="1"/>
-								</xs:choice>
-								<xs:attribute name="name" type="xs:string" use="required" />
-								<xs:attribute name="caption" type="xs:string" />
-								<xs:attribute name="cache" type="xs:boolean" />
-								<xs:attribute name="columnForExport" type="xs:string" />
-								<xs:attributeGroup ref="DBTableDefaultColumnAttrs" />
+								<xs:sequence>
+									<xs:element name="menuItem" minOccurs="1" maxOccurs="unbounded">
+										<xs:complexType>
+											<xs:sequence>
+												<xs:element name="clickScript" type="script"
+													minOccurs="1" maxOccurs="1" />
+											</xs:sequence>
+											<xs:attribute name="caption" type="xs:string"
+												use="required" />
+											<xs:attribute name="icon" type="xs:string" />
+										</xs:complexType>
+									</xs:element>
+								</xs:sequence>
 							</xs:complexType>
 						</xs:element>
+						<xs:element name="scriptMenuGenerator" type="script" minOccurs="1"
+							maxOccurs="1" />
 					</xs:choice>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="fixed-order-by" minOccurs="0" maxOccurs="1">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="prefix" minOccurs="0" maxOccurs="1">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="column" type="DBSortColumn" minOccurs="1" maxOccurs="unbounded"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="suffix" minOccurs="0" maxOccurs="1">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="column" type="DBSortColumn" minOccurs="1" maxOccurs="unbounded"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="bind" type="DBMultiBind" minOccurs="0" maxOccurs="1" />
-		<xs:element name="events" type="DBTableEvents" minOccurs="0" maxOccurs="1" />
-		<xs:element name="styleGenerator" minOccurs="0" maxOccurs="1">
-			<xs:complexType>
-				<xs:choice>
-					<xs:element name="scriptGenerator" type="script" minOccurs="1" maxOccurs="1"/>
-				</xs:choice>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="editableFieldsGenerator" minOccurs="0" maxOccurs="1">
-			<xs:complexType>
-				<xs:choice>
-					<xs:element name="scriptGenerator" type="script" minOccurs="1" maxOccurs="1"/>
-				</xs:choice>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="cellDescriptionGenerator" minOccurs="0" maxOccurs="1">
-			<xs:complexType>
-				<xs:choice>
-					<xs:element name="scriptGenerator" type="script" minOccurs="1" maxOccurs="1"/>
-				</xs:choice>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="menuGenerator" minOccurs="0" maxOccurs="1">
-			<xs:complexType>
-				<xs:choice minOccurs="0" maxOccurs="1">
-					<xs:element name="staticMenuGenerator" minOccurs="1" maxOccurs="1">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="menuItem" minOccurs="1" maxOccurs="unbounded">
-									<xs:complexType>
-										<xs:sequence>
-											<xs:element name="clickScript" type="script" minOccurs="1" maxOccurs="1" />
-										</xs:sequence>
-										<xs:attribute name="caption" type="xs:string" use="required" />
-										<xs:attribute name="icon" type="xs:string" />
-									</xs:complexType>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="scriptMenuGenerator" type="script" minOccurs="1" maxOccurs="1" />
-				</xs:choice>
-			</xs:complexType>
-		</xs:element>
-	</xs:sequence>
-	<xs:attributeGroup ref="fieldAttrs" />
-	<xs:attribute name="rows" type="xs:integer" />
-	<xs:attribute name="rowHeight" type="xs:string" />
-	<xs:attribute name="multivalue" type="xs:boolean" default="false" />
-	<xs:attribute name="selectable" type="xs:boolean" />
-	<xs:attribute name="alwaysSelectable" type="xs:boolean" />
-	<xs:attribute name="gridSelectable" type="xs:boolean" />
-	<xs:attribute name="requireFilter" type="xs:boolean" />
-	<xs:attribute name="maxSelectedItens" type="xs:positiveInteger" />
-	<xs:attribute name="editable" type="xs:boolean" />
-	<xs:attribute name="editAsync" type="xs:boolean" />
-	<xs:attribute name="allowHideColumns" type="xs:boolean" />
-	<xs:attribute name="editDisposition">
-		<xs:simpleType>
-			<xs:restriction base="xs:string">
-				<xs:enumeration value="INLINE" />
-				<xs:enumeration value="MODAL" />
-			</xs:restriction>
-		</xs:simpleType>
-	</xs:attribute>	
-	<xs:attribute name="showRowCount" type="xs:boolean" />
-	<xs:attribute name="exportXLS" type="xs:boolean" />
-	<xs:attribute name="exportCSV" type="xs:boolean" />
-	<xs:attribute name="drawRefreshButton" type="xs:boolean" />
-	<xs:attribute name="drawFilterButton" type="xs:boolean" />
-	<xs:attribute name="autoRefreshSeconds" type="xs:positiveInteger" />
-	<xs:attribute name="keepState" type="xs:boolean" />
-	<xs:attribute name="keepOldStateDays" type="xs:integer" />
-	<xs:attribute name="compact" type="xs:boolean" />
-	<xs:attribute name="borderless" type="xs:boolean" />
-	<xs:attribute name="debugSQL" type="xs:boolean" />
-	<xs:attribute name="useGridComponent" type="xs:boolean" />
-	<xs:attribute name="stateScope" use="optional">
-		<xs:simpleType>
-			<xs:restriction base="xs:string">
-      			<xs:enumeration value="PROCESS_KEY"/>
-<!--       			<xs:enumeration value="PROCESS_VERSION"/> -->
-      			<xs:enumeration value="INSTANCE"/>
-    		</xs:restriction>		
-		</xs:simpleType>
-	</xs:attribute>
-	<xs:attribute name="frozenColumns" type="xs:positiveInteger" />
-	<xs:attribute name="rowCacheRate" type="xs:integer" />
-	<xs:attribute name="columnSortMode" use="optional" >
-		<xs:simpleType>
-			<xs:restriction base="xs:string">
-				<xs:enumeration value="FORCE_ENABLED" />
-				<xs:enumeration value="FORCE_DISABLED" />
-				<xs:enumeration value="DEFAULT_ENABLED" />
-				<xs:enumeration value="DEFAULT_DISABLED" />
-			</xs:restriction>
-		</xs:simpleType>
-	</xs:attribute>
-	<xs:attribute name="scrollEditableGridOnUserFocus" type="xs:boolean" />
-	<xs:attribute name="autoSelectTextInEditableFieldFocus" type="xs:boolean" />
-</xs:complexType>
+				</xs:complexType>
+			</xs:element>
+		</xs:sequence>
+		<xs:attributeGroup ref="fieldAttrs" />
+		<xs:attribute name="rows" type="xs:integer" />
+		<xs:attribute name="rowHeight" type="xs:string" />
+		<xs:attribute name="multivalue" type="xs:boolean" default="false" />
+		<xs:attribute name="selectable" type="xs:boolean" />
+		<xs:attribute name="alwaysSelectable" type="xs:boolean" />
+		<xs:attribute name="gridSelectable" type="xs:boolean" />
+		<xs:attribute name="requireFilter" type="xs:boolean" />
+		<xs:attribute name="maxSelectedItens" type="xs:positiveInteger" />
+		<xs:attribute name="editable" type="xs:boolean" />
+		<xs:attribute name="editAsync" type="xs:boolean" />
+		<xs:attribute name="allowHideColumns" type="xs:boolean" />
+		<xs:attribute name="editDisposition">
+			<xs:simpleType>
+				<xs:restriction base="xs:string">
+					<xs:enumeration value="INLINE" />
+					<xs:enumeration value="MODAL" />
+				</xs:restriction>
+			</xs:simpleType>
+		</xs:attribute>
+		<xs:attribute name="showRowCount" type="xs:boolean" />
+		<xs:attribute name="exportXLS" type="xs:boolean" />
+		<xs:attribute name="exportCSV" type="xs:boolean" />
+		<xs:attribute name="drawRefreshButton" type="xs:boolean" />
+		<xs:attribute name="drawFilterButton" type="xs:boolean" />
+		<xs:attribute name="autoRefreshSeconds" type="xs:positiveInteger" />
+		<xs:attribute name="keepState" type="xs:boolean" />
+		<xs:attribute name="keepOldStateDays" type="xs:integer" />
+		<xs:attribute name="compact" type="xs:boolean" />
+		<xs:attribute name="borderless" type="xs:boolean" />
+		<xs:attribute name="debugSQL" type="xs:boolean" />
+		<xs:attribute name="useGridComponent" type="xs:boolean" />
+		<xs:attribute name="stateScope" use="optional">
+			<xs:simpleType>
+				<xs:restriction base="xs:string">
+					<xs:enumeration value="PROCESS_KEY" />
+					<!--       			<xs:enumeration value="PROCESS_VERSION"/> -->
+					<xs:enumeration value="INSTANCE" />
+				</xs:restriction>
+			</xs:simpleType>
+		</xs:attribute>
+		<xs:attribute name="frozenColumns" type="xs:positiveInteger" />
+		<xs:attribute name="rowCacheRate" type="xs:integer" />
+		<xs:attribute name="columnSortMode" use="optional">
+			<xs:simpleType>
+				<xs:restriction base="xs:string">
+					<xs:enumeration value="FORCE_ENABLED" />
+					<xs:enumeration value="FORCE_DISABLED" />
+					<xs:enumeration value="DEFAULT_ENABLED" />
+					<xs:enumeration value="DEFAULT_DISABLED" />
+				</xs:restriction>
+			</xs:simpleType>
+		</xs:attribute>
+		<xs:attribute name="scrollEditableGridOnUserFocus" type="xs:boolean" />
+		<xs:attribute name="autoSelectTextInEditableFieldFocus" type="xs:boolean" />
+	</xs:complexType>
+
+	<xs:complexType name="columnFilter">
+		<xs:attribute name="name" type="xs:string" use="required" />
+		<!-- Possiveis operadores de comparacao. Devem ser separados por ",". Valores: eq, ne, gt,
+		ge, lt, le, lk -->
+		<xs:attribute name="compareWith" type="xs:string" />
+	</xs:complexType>
+
+	<xs:complexType name="bindParameter">
+		<xs:choice minOccurs="0" maxOccurs="1">
+			<xs:element name="subquery-as-exists" type="xs:string" />
+		</xs:choice>
+		<xs:attribute name="name" type="xs:string" use="required" />
+		<xs:attribute name="parameterType">
+			<xs:simpleType>
+				<xs:restriction base="xs:string">
+					<xs:enumeration value="string" />
+					<xs:enumeration value="number" />
+					<xs:enumeration value="date" />
+				</xs:restriction>
+			</xs:simpleType>
+		</xs:attribute>
+	</xs:complexType>
 
-<xs:complexType name="columnFilter">
-	<xs:attribute name="name" type="xs:string" use="required" />
-	<!-- Possiveis operadores de comparacao. Devem ser separados por ",". Valores: eq, ne, gt, ge, lt, le, lk -->
-	<xs:attribute name="compareWith" type="xs:string" />
-</xs:complexType>
+	<!-- Componente de pesquisa baseado em um datasource dinamico -->
+	<xs:complexType name="DBFilter">
+		<xs:sequence>
+			<xs:element name="onFilter" minOccurs="0" maxOccurs="1">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="notify-script" type="columnFilter" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="columns" minOccurs="0" maxOccurs="1">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="column" type="DBFilterColumn" minOccurs="1"
+							maxOccurs="unbounded" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+		</xs:sequence>
+		<xs:attribute name="dbtableId" type="xs:string" />
+		<xs:attribute name="filterLayoutId" type="xs:string" />
+		<xs:attribute name="hideOnEmpty" type="xs:boolean" />
+		<xs:attribute name="id" type="xs:string" />
+		<xs:attribute name="caption" type="xs:string" />
+		<xs:attribute name="showSelected" type="xs:boolean" />
+		<xs:attribute name="dynamicColumns" type="xs:boolean" />
+		<xs:attribute name="automaticFilter" type="xs:boolean" />
+		<xs:attribute name="renderType">
+			<xs:simpleType>
+				<xs:restriction base="xs:string">
+					<xs:enumeration value="BUTTON" />
+					<xs:enumeration value="INLINE" />
+					<xs:enumeration value="TARGET" />
+				</xs:restriction>
+			</xs:simpleType>
+		</xs:attribute>
+		<xs:attribute name="width" type="xs:string" />
+	</xs:complexType>
 
-<xs:complexType name="bindParameter">
-	<xs:choice minOccurs="0" maxOccurs="1">
-		<xs:element name="subquery-as-exists" type="xs:string" />
-	</xs:choice>
-	<xs:attribute name="name" type="xs:string" use="required" />
-	<xs:attribute name="parameterType">
-		<xs:simpleType>
-			<xs:restriction base="xs:string">
-      			<xs:enumeration value="string"/>
-      			<xs:enumeration value="number"/>
-      			<xs:enumeration value="date"/>
-    		</xs:restriction>		
-		</xs:simpleType>
-	</xs:attribute>
-</xs:complexType>
+	<!-- Componente de pesquisa baseado em um datasource dinamico -->
+	<xs:complexType name="DBSearchField">
+		<xs:sequence>
+			<xs:element name="datasource" type="datasource-with-builder" minOccurs="1" maxOccurs="1" />
+			<xs:element name="loadItemQuery" type="xs:string" minOccurs="0" maxOccurs="1" />
+			<xs:element name="key-field" type="xs:string" minOccurs="1" maxOccurs="1" />
+			<xs:element name="caption-field" type="xs:string" minOccurs="1" maxOccurs="1" />
+			<xs:element name="columns" minOccurs="0" maxOccurs="1">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="column" type="DBTableColumn" minOccurs="1"
+							maxOccurs="unbounded" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
 
-<!-- Componente de pesquisa baseado em um datasource dinamico -->
-<xs:complexType name="DBFilter">
-	<xs:sequence>
-		<xs:element name="onFilter" minOccurs="0" maxOccurs="1">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="notify-script" type="columnFilter" />
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="columns" minOccurs="0" maxOccurs="1">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="column" type="DBFilterColumn" minOccurs="1" maxOccurs="unbounded" />
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-	</xs:sequence>
-	<xs:attribute name="dbtableId" type="xs:string" />
-	<xs:attribute name="filterLayoutId" type="xs:string" />
-	<xs:attribute name="hideOnEmpty" type="xs:boolean" />
-	<xs:attribute name="id" type="xs:string" />
-	<xs:attribute name="caption" type="xs:string" />
-	<xs:attribute name="showSelected" type="xs:boolean" />
-	<xs:attribute name="dynamicColumns" type="xs:boolean" />
-	<xs:attribute name="automaticFilter" type="xs:boolean" />
-	<xs:attribute name="renderType">
-		<xs:simpleType>
-			<xs:restriction base="xs:string">
-				<xs:enumeration value="BUTTON" />
-				<xs:enumeration value="INLINE" />
-				<xs:enumeration value="TARGET" />
-			</xs:restriction>
-		</xs:simpleType>
-	</xs:attribute>
-	<xs:attribute name="width" type="xs:string" />
-</xs:complexType>
+			<!-- Propriedades de filtragem -->
+			<xs:element name="filterProperties" minOccurs="0" maxOccurs="1">
+				<xs:complexType>
+					<xs:sequence minOccurs="0" maxOccurs="unbounded">
+						<xs:element name="value">
+							<xs:complexType>
+								<xs:simpleContent>
+									<xs:extension base="xs:string">
+										<xs:attribute name="inputMask" type="xs:string" />
+										<xs:attribute name="resolution">
+											<xs:simpleType>
+												<xs:restriction base="xs:string">
+													<xs:enumeration value="SECOND" />
+													<xs:enumeration value="MINUTE" />
+													<xs:enumeration value="HOUR" />
+													<xs:enumeration value="DAY" />
+													<xs:enumeration value="MONTH" />
+													<xs:enumeration value="YEAR" />
+												</xs:restriction>
+											</xs:simpleType>
+										</xs:attribute>
+									</xs:extension>
+								</xs:simpleContent>
+							</xs:complexType>
+						</xs:element>
+					</xs:sequence>
+					<xs:attribute name="filterRequired" type="xs:boolean" />
+				</xs:complexType>
+			</xs:element>
 
-<!-- Componente de pesquisa baseado em um datasource dinamico -->
-<xs:complexType name="DBSearchField">
-	<xs:sequence>
-		<xs:element name="datasource" type="datasource-with-builder" minOccurs="1" maxOccurs="1" />
-		<xs:element name="loadItemQuery" type="xs:string" minOccurs="0" maxOccurs="1" />
-		<xs:element name="key-field" type="xs:string" minOccurs="1" maxOccurs="1" />
-		<xs:element name="caption-field" type="xs:string" minOccurs="1" maxOccurs="1" />
-		<xs:element name="columns" minOccurs="0" maxOccurs="1">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="column" type="DBTableColumn" minOccurs="1" maxOccurs="unbounded" />
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-		
-		<!-- Propriedades de filtragem -->
-		<xs:element name="filterProperties" minOccurs="0" maxOccurs="1">
-			<xs:complexType>
-				<xs:sequence minOccurs="0" maxOccurs="unbounded">
-					<xs:element name="value">
-						<xs:complexType>
-							<xs:simpleContent>
-								<xs:extension base="xs:string">
-									<xs:attribute name="inputMask" type="xs:string" />
-									<xs:attribute name="resolution">
-										<xs:simpleType>
-											<xs:restriction base="xs:string">
-												<xs:enumeration value="SECOND"/>
-												<xs:enumeration value="MINUTE"/>
-												<xs:enumeration value="HOUR"/>
-												<xs:enumeration value="DAY"/>
-												<xs:enumeration value="MONTH"/>
-												<xs:enumeration value="YEAR"/>
-											</xs:restriction>
-										</xs:simpleType>
-									</xs:attribute>
-								</xs:extension>
-							</xs:simpleContent>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-				<xs:attribute name="filterRequired" type="xs:boolean" />
-			</xs:complexType>
-		</xs:element>
-		 
-		<!-- Componentes customizados para filtragem -->
-		<xs:element name="customFilterComponents" minOccurs="0" maxOccurs="1">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="component" minOccurs="1" maxOccurs="unbounded">
-						<xs:complexType>
-							<xs:sequence minOccurs="1" maxOccurs="1">
-								<xs:any processContents="skip" />
-								<xs:element name="initialValue" type="userInfoInitialValue" minOccurs="0" maxOccurs="1"/>
-								<xs:element name="valuePrefix" type="xs:string" minOccurs="0" maxOccurs="1" />
-								<xs:element name="valueSuffix" type="xs:string" minOccurs="0" maxOccurs="1" />
-								<xs:choice>
-									<xs:element name="column" type="columnFilter" />
-									<xs:element name="parameter" type="bindParameter" />
-								</xs:choice>
-							</xs:sequence>
-							<xs:attribute name="filterOnChange" type="xs:boolean" />
-							<xs:attribute name="displayOnTableColumn" type="xs:string" />
-							<xs:attribute name="allowNullSettingByFilter" type="xs:boolean"/>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-				<xs:attribute name="componentsPerRow" type="xs:positiveInteger" />
-			</xs:complexType>
-		</xs:element>
-		<xs:element name="bind" type="DBMultiBind" minOccurs="0" maxOccurs="1" />
-		<xs:element name="validation" type="scriptValidators" minOccurs="0" maxOccurs="1" />
-		<xs:element name="events" type="allEvents" minOccurs="0" maxOccurs="1" />
-	</xs:sequence>
-	<xs:attributeGroup ref="fieldAttrs" />
-	<xs:attributeGroup ref="companyDefinitionAttrs" />
-	<xs:attributeGroup ref="tagFieldAttrs" />
-	<xs:attributeGroup ref="personDefinitionAttrs" />
-	<xs:attribute name="searchViewRows" type="xs:positiveInteger" />
-	<xs:attribute name="searchViewWidth" type="xs:string" />
-	<xs:attribute name="searchViewHeight" type="xs:string" />
-	<xs:attribute name="searchViewResizable" type="xs:boolean" />
-	<xs:attribute name="searchViewTitle" type="xs:string" />
-	<xs:attribute name="searchViewDescription" type="xs:string" />
-	<xs:attribute name="key-field-search-enabled" type="xs:boolean" />
-	<xs:attribute name="key-field-search-visible" type="xs:boolean" />
-	<xs:attribute name="key-field-search-width" type="xs:string" />
-</xs:complexType>
+			<!-- Componentes customizados para filtragem -->
+			<xs:element name="customFilterComponents" minOccurs="0" maxOccurs="1">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="component" minOccurs="1" maxOccurs="unbounded">
+							<xs:complexType>
+								<xs:sequence minOccurs="1" maxOccurs="1">
+									<xs:any processContents="skip" />
+									<xs:element name="initialValue" type="userInfoInitialValue"
+										minOccurs="0" maxOccurs="1" />
+									<xs:element name="valuePrefix" type="xs:string" minOccurs="0"
+										maxOccurs="1" />
+									<xs:element name="valueSuffix" type="xs:string" minOccurs="0"
+										maxOccurs="1" />
+									<xs:choice>
+										<xs:element name="column" type="columnFilter" />
+										<xs:element name="parameter" type="bindParameter" />
+									</xs:choice>
+								</xs:sequence>
+								<xs:attribute name="filterOnChange" type="xs:boolean" />
+								<xs:attribute name="displayOnTableColumn" type="xs:string" />
+								<xs:attribute name="allowNullSettingByFilter" type="xs:boolean" />
+							</xs:complexType>
+						</xs:element>
+					</xs:sequence>
+					<xs:attribute name="componentsPerRow" type="xs:positiveInteger" />
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="bind" type="DBMultiBind" minOccurs="0" maxOccurs="1" />
+			<xs:element name="validation" type="scriptValidators" minOccurs="0" maxOccurs="1" />
+			<xs:element name="events" type="allEvents" minOccurs="0" maxOccurs="1" />
+		</xs:sequence>
+		<xs:attributeGroup ref="fieldAttrs" />
+		<xs:attributeGroup ref="companyDefinitionAttrs" />
+		<xs:attributeGroup ref="tagFieldAttrs" />
+		<xs:attributeGroup ref="personDefinitionAttrs" />
+		<xs:attribute name="searchViewRows" type="xs:positiveInteger" />
+		<xs:attribute name="searchViewWidth" type="xs:string" />
+		<xs:attribute name="searchViewHeight" type="xs:string" />
+		<xs:attribute name="searchViewResizable" type="xs:boolean" />
+		<xs:attribute name="searchViewTitle" type="xs:string" />
+		<xs:attribute name="searchViewDescription" type="xs:string" />
+		<xs:attribute name="key-field-search-enabled" type="xs:boolean" />
+		<xs:attribute name="key-field-search-visible" type="xs:boolean" />
+		<xs:attribute name="key-field-search-width" type="xs:string" />
+	</xs:complexType>
 
 </xs:schema>
diff --git a/vitruvio-form-widgets.xsd b/vitruvio-form-widgets.xsd
index b79f980..67a4e67 100644
--- a/vitruvio-form-widgets.xsd
+++ b/vitruvio-form-widgets.xsd
@@ -30,6 +30,7 @@
 	<xs:attribute name="caption-field" type="xs:string" use="required"/>
 	<xs:attribute name="start-date-field" type="xs:string" use="required"/>
 	<xs:attribute name="end-date-field" type="xs:string" use="required"/>
+    <xs:attribute name="style-name-field" type="xs:string" use="optional"/>
 	<xs:attribute name="description-field" type="xs:string" use="optional"/>
 	<xs:attributeGroup ref="datasource-basic-attrs" />
 </xs:complexType>
@@ -81,12 +82,40 @@
 </xs:complexType>
 
 <!-- Calendar -->
+<xs:complexType name="CalendarMultiBind">
+    <xs:sequence minOccurs="1" maxOccurs="unbounded">
+        <xs:choice>
+            <xs:element name="parameter">
+                <xs:complexType>
+                    <xs:attribute name="field-ref" type="xs:string" use="optional" />
+                    <xs:attribute name="context-value" use="optional" >
+                        <xs:simpleType>
+                            <xs:restriction base="xs:string">
+                                <xs:enumeration value="PROCESS_INSTANCE_ID" />
+                                <xs:enumeration value="PROCESS_BUSINESS_KEY" />
+                                <xs:enumeration value="TASK_ID" />
+                                <xs:enumeration value="USER_LOGIN" />
+                                <xs:enumeration value="USER_COMPANYS" />
+                            </xs:restriction>
+                        </xs:simpleType>
+                    </xs:attribute>
+                    <xs:attribute name="parameterName" type="xs:string" use="required" />
+                    <xs:attribute name="defaultValue" type="xs:string" use="required" />
+                    <xs:attributeGroup ref="value-type-enum" />
+                </xs:complexType>
+            </xs:element>
+        </xs:choice>
+    </xs:sequence>
+    <xs:attribute name="refreshOnChange" type="xs:boolean" />
+</xs:complexType>
+
 <xs:complexType name="CalendarWidget">
 	<xs:sequence>
 		<xs:choice>
 			<xs:element name="sql-datasource" type="calendar-datasource-with-builder" minOccurs="1" maxOccurs="1" />
 		</xs:choice>
 		<xs:element name="events" type="calendarEvents" minOccurs="0" maxOccurs="1" />
+        <xs:element name="bind" type="CalendarMultiBind" minOccurs="0" maxOccurs="1" />
 	</xs:sequence>
 	<xs:attribute name="id" type="xs:string" use="required" />
 	<xs:attributeGroup ref="basicElement" />
@@ -101,6 +130,7 @@
 	</xs:attribute>
 	<xs:attribute name="showViewTypeButtons" type="xs:boolean" use="optional" />
 	<xs:attribute name="showNavigationButtons" type="xs:boolean" use="optional" />
+    <xs:attribute name="showRefreshButton" type="xs:boolean" use="optional" />
 </xs:complexType>
 
 <!-- Definicao de widgets CORE, dentro do Namespace do Vitruvio -->
diff --git a/vitruvio-mobile-base-form.xsd b/vitruvio-mobile-base-form.xsd
index 64a657e..db39c7a 100644
--- a/vitruvio-mobile-base-form.xsd
+++ b/vitruvio-mobile-base-form.xsd
@@ -232,6 +232,7 @@
 			<!-- Suporte a definicao de widgets -->
 			<xs:group ref="CoreWidgets" />
 			<xs:element name="GridEditorWidget" type="GridEditorWidget" minOccurs="0" maxOccurs="unbounded" />
+			<xs:element name="Barcode" type="Barcode" minOccurs="0" maxOccurs="unbounded" />
 			<xs:element name="ProgressBarLinear" type="ProgressBarLinear" minOccurs="0" maxOccurs="unbounded" />
 			
 			<xs:element name="CustomWidget" type="CustomWidget" />
diff --git a/vitruvio-mobile-form.xsd b/vitruvio-mobile-form.xsd
index 0821fb3..a377ba5 100644
--- a/vitruvio-mobile-form.xsd
+++ b/vitruvio-mobile-form.xsd
@@ -1,71 +1,80 @@
 <?xml version="1.0"?>
-<xs:schema xmlns="http://www.davinti.com.br/vitruvio/mobile-form" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.davinti.com.br/vitruvio/mobile-form" elementFormDefault="qualified">
-
-<!-- Parametros comuns nos Campos -->
-<xs:include schemaLocation="vitruvio-form-common-attrs.xsd" />
-
-<!-- Componentes padrao -->
-<xs:include schemaLocation="vitruvio-form-basic-components.xsd" />
-
-<!-- Componentes para uso com bancos de dados -->
-<xs:include schemaLocation="vitruvio-form-db-components.xsd" />
-
-<!-- Componentes especificos ao contexto da aplicacao -->
-<xs:include schemaLocation="vitruvio-form-specific-components.xsd" />
-
-<!-- Form containers -->
-<xs:include schemaLocation="vitruvio-form-containers.xsd" />
-
-<!-- Scripting defs -->
-<xs:include schemaLocation="vitruvio-form-scripting.xsd" />
-
-<!-- Suporte a Widgets -->
-<xs:include schemaLocation="vitruvio-form-widgets.xsd" />
-
-<!-- Scripting defs -->
-<xs:include schemaLocation="vitruvio-form-scripting.xsd" />
-
-<!-- Base Form -->
-<xs:include schemaLocation="vitruvio-mobile-base-form.xsd" />
-
-
-<!-- Autoload support -->
-<xs:attributeGroup name="autoload-base-attrs">
-	<xs:attribute name="autoPersist" type="xs:boolean" />
-	<xs:attribute name="autoOverride" type="xs:boolean" />
-	<xs:attribute name="autoInjectionVariableName" type="xs:string" />
-	<xs:attribute name="autoInjectionScope">
-		<xs:simpleType>
-			<xs:restriction base="xs:string">
-      			<xs:enumeration value="NONE"/>
-      			<xs:enumeration value="SCRIPT_SCOPE"/>
-      			<xs:enumeration value="ENGINE_GLOBAL_SCOPE"/>
-    		</xs:restriction>
-		</xs:simpleType>
-	</xs:attribute>
-</xs:attributeGroup>
-
-<xs:complexType name="autoload-variables">
-	<xs:sequence>
-		<xs:element name="variable" minOccurs="1" maxOccurs="unbounded" type="xs:string" />
-	</xs:sequence>
-	<xs:attributeGroup ref="autoload-base-attrs" />
-</xs:complexType>
-
-<xs:complexType name="autoload-form">
-	<xs:attribute name="formKey" type="xs:string" use="required" />
-	<xs:attribute name="taskDefinitionKey" type="xs:string" />
-	<xs:attribute name="onlyCompleteTask" type="xs:boolean" />
-	<xs:attributeGroup ref="autoload-base-attrs" />
-</xs:complexType>
-
-<xs:complexType name="autoload-bridge">
-	<xs:attribute name="bridgeId" type="xs:string" use="required" />
-	<xs:attributeGroup ref="autoload-base-attrs" />
-</xs:complexType>
-
-<xs:complexType name="MobileAutoloadInfo">
-	<xs:sequence>
+<xs:schema xmlns="http://www.davinti.com.br/vitruvio/mobile-form"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://www.davinti.com.br/vitruvio/mobile-form" elementFormDefault="qualified">
+
+	<!-- Parametros comuns nos Campos -->
+	<xs:include schemaLocation="vitruvio-form-common-attrs.xsd" />
+
+	<!-- Componentes padrao -->
+	<xs:include schemaLocation="vitruvio-form-basic-components.xsd" />
+
+	<!-- Componentes para uso com bancos de dados -->
+	<xs:redefine schemaLocation="vitruvio-form-db-components.xsd">
+		<xs:group name="DatasourceWithBuilderOptions">
+			<xs:choice>
+				<xs:group ref="DatasourceWithBuilderOptions" />
+				<xs:element name="form-datasource" type="formRefDataSource" />
+			</xs:choice>
+		</xs:group>
+	</xs:redefine>
+
+	<!-- Componentes especificos ao contexto da aplicacao -->
+	<xs:include schemaLocation="vitruvio-form-specific-components.xsd" />
+
+	<!-- Form containers -->
+	<xs:include schemaLocation="vitruvio-form-containers.xsd" />
+
+	<!-- Scripting defs -->
+	<xs:include schemaLocation="vitruvio-form-scripting.xsd" />
+
+	<!-- Suporte a Widgets -->
+	<xs:include schemaLocation="vitruvio-form-widgets.xsd" />
+
+	<!-- Scripting defs -->
+	<xs:include schemaLocation="vitruvio-form-scripting.xsd" />
+
+	<!-- Base Form -->
+	<xs:include schemaLocation="vitruvio-mobile-base-form.xsd" />
+
+
+	<!-- Autoload support -->
+	<xs:attributeGroup name="autoload-base-attrs">
+		<xs:attribute name="autoPersist" type="xs:boolean" />
+		<xs:attribute name="autoOverride" type="xs:boolean" />
+		<xs:attribute name="autoInjectionVariableName" type="xs:string" />
+		<xs:attribute name="autoInjectionScope">
+			<xs:simpleType>
+				<xs:restriction base="xs:string">
+					<xs:enumeration value="NONE" />
+					<xs:enumeration value="SCRIPT_SCOPE" />
+					<xs:enumeration value="ENGINE_GLOBAL_SCOPE" />
+				</xs:restriction>
+			</xs:simpleType>
+		</xs:attribute>
+	</xs:attributeGroup>
+
+	<xs:complexType name="autoload-variables">
+		<xs:sequence>
+			<xs:element name="variable" minOccurs="1" maxOccurs="unbounded" type="xs:string" />
+		</xs:sequence>
+		<xs:attributeGroup ref="autoload-base-attrs" />
+	</xs:complexType>
+
+	<xs:complexType name="autoload-form">
+		<xs:attribute name="formKey" type="xs:string" use="required" />
+		<xs:attribute name="taskDefinitionKey" type="xs:string" />
+		<xs:attribute name="onlyCompleteTask" type="xs:boolean" />
+		<xs:attributeGroup ref="autoload-base-attrs" />
+	</xs:complexType>
+
+	<xs:complexType name="autoload-bridge">
+		<xs:attribute name="bridgeId" type="xs:string" use="required" />
+		<xs:attributeGroup ref="autoload-base-attrs" />
+	</xs:complexType>
+
+	<xs:complexType name="MobileAutoloadInfo">
+		<xs:sequence>
 			<xs:element name="variables" type="autoload-variables" minOccurs="0" maxOccurs="1" />
 			<xs:element name="forms" minOccurs="0" maxOccurs="1">
 				<xs:complexType>
@@ -81,83 +90,91 @@
 					</xs:sequence>
 				</xs:complexType>
 			</xs:element>
-	</xs:sequence>
-	<xs:attributeGroup ref="autoload-base-attrs" />
-</xs:complexType>
-
-<xs:complexType name="MobileFormTaskPropertiesDisplaySettings">
-	<xs:attribute name="showCompleteItensCount" type="xs:boolean" />
-	<xs:attribute name="showStartUser" type="xs:boolean" />
-	<xs:attribute name="showDuedate" type="xs:boolean" />
-	<xs:attribute name="showExtendedProperties" type="xs:boolean" />
-	<xs:attribute name="extendedPropertiesVariableName" type="xs:string" />
-</xs:complexType>
-
-<xs:complexType name="MobileFormNavButton">
-	<xs:sequence minOccurs="1" maxOccurs="1">
-		<xs:element name="clickScript" type="script" minOccurs="1" maxOccurs="1" />
-	</xs:sequence>
-	<xs:attribute name="id" type="xs:string" use="required" />
-	<xs:attribute name="icon" type="xs:string" use="required" />
-	<xs:attribute name="caption" type="xs:string" />
-	<xs:attribute name="description" type="xs:string" />
-</xs:complexType>
-
-<xs:complexType name="MobileFormNavButtonSettings">
-	<xs:sequence>
-		<xs:element name="customButtons" minOccurs="0" maxOccurs="1">
-			<xs:complexType>
+		</xs:sequence>
+		<xs:attributeGroup ref="autoload-base-attrs" />
+	</xs:complexType>
+
+	<xs:complexType name="MobileFormTaskPropertiesDisplaySettings">
+		<xs:attribute name="showCompleteItensCount" type="xs:boolean" />
+		<xs:attribute name="showStartUser" type="xs:boolean" />
+		<xs:attribute name="showDuedate" type="xs:boolean" />
+		<xs:attribute name="showExtendedProperties" type="xs:boolean" />
+		<xs:attribute name="extendedPropertiesVariableName" type="xs:string" />
+	</xs:complexType>
+
+	<xs:complexType name="MobileFormNavButton">
+		<xs:sequence minOccurs="1" maxOccurs="1">
+			<xs:element name="clickScript" type="script" minOccurs="1" maxOccurs="1" />
+		</xs:sequence>
+		<xs:attribute name="id" type="xs:string" use="required" />
+		<xs:attribute name="icon" type="xs:string" use="required" />
+		<xs:attribute name="caption" type="xs:string" />
+		<xs:attribute name="description" type="xs:string" />
+	</xs:complexType>
+
+	<xs:complexType name="MobileFormNavButtonSettings">
+		<xs:sequence>
+			<xs:element name="customButtons" minOccurs="0" maxOccurs="1">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="button" type="MobileFormNavButton" minOccurs="1"
+							maxOccurs="unbounded" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+		</xs:sequence>
+		<xs:attribute name="position">
+			<xs:simpleType id="test">
+				<xs:restriction base="xs:string">
+					<xs:enumeration value="TOP_RIGHT"></xs:enumeration>
+					<xs:enumeration value="TOP_LEFT"></xs:enumeration>
+					<xs:enumeration value="BOTTOM_RIGHT"></xs:enumeration>
+					<xs:enumeration value="BOTTOM_LEFT"></xs:enumeration>
+				</xs:restriction>
+			</xs:simpleType>
+		</xs:attribute>
+		<xs:attribute name="showNavButton" type="xs:boolean" />
+		<xs:attribute name="showCompleteButton" type="xs:boolean" />
+		<xs:attribute name="startOpened" type="xs:boolean" />
+	</xs:complexType>
+
+	<xs:complexType name="vitruvio-mobile-form">
+		<xs:complexContent>
+			<xs:extension base="vitruvio-subform-enabled-form">
 				<xs:sequence>
-					<xs:element name="button" type="MobileFormNavButton" minOccurs="1" maxOccurs="unbounded" />
+					<xs:element name="Autoload" type="MobileAutoloadInfo" minOccurs="0"
+						maxOccurs="1" />
+					<xs:element name="ServerSide" type="MobileServerSide" minOccurs="0"
+						maxOccurs="1" />
+					<xs:element name="TaskPropertiesDisplaySettings"
+						type="MobileFormTaskPropertiesDisplaySettings" minOccurs="0" maxOccurs="1" />
+					<xs:element name="NavButtonSettings" type="MobileFormNavButtonSettings"
+						minOccurs="0" maxOccurs="1" />
 				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-	</xs:sequence>
-	<xs:attribute name="position">
-		<xs:simpleType id="test">
-			<xs:restriction base="xs:string">
-				<xs:enumeration value="TOP_RIGHT"></xs:enumeration>
-				<xs:enumeration value="TOP_LEFT"></xs:enumeration>
-				<xs:enumeration value="BOTTOM_RIGHT"></xs:enumeration>
-				<xs:enumeration value="BOTTOM_LEFT"></xs:enumeration>
-			</xs:restriction>
-		</xs:simpleType>
-  	</xs:attribute>
-	<xs:attribute name="showNavButton" type="xs:boolean" />
-	<xs:attribute name="showCompleteButton" type="xs:boolean" />
-	<xs:attribute name="startOpened" type="xs:boolean" />
-</xs:complexType>
-
-<xs:complexType name="vitruvio-mobile-form">
-	<xs:complexContent>
-		<xs:extension base="vitruvio-subform-enabled-form">
+				<xs:attribute name="requiredDurationNotes" type="xs:boolean" />
+				<xs:attribute name="shouldDisplayNextTask" type="xs:boolean" />
+				<xs:attribute name="shouldDisplayNextTaskWithoutConfirmation" type="xs:boolean" />
+				<xs:attribute name="shouldRefreshTasksFromBackendAfterEnd" type="xs:boolean" />
+				<xs:attribute name="preventAttach" type="xs:boolean" />
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+
+	<xs:element name="mobile-forms">
+		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="Autoload" type="MobileAutoloadInfo" minOccurs="0" maxOccurs="1" />
-				<xs:element name="ServerSide" type="MobileServerSide" minOccurs="0" maxOccurs="1" />
-				<xs:element name="TaskPropertiesDisplaySettings" type="MobileFormTaskPropertiesDisplaySettings" minOccurs="0" maxOccurs="1" />
-				<xs:element name="NavButtonSettings" type="MobileFormNavButtonSettings" minOccurs="0" maxOccurs="1" />
+				<xs:element name="library" type="library" minOccurs="0" maxOccurs="1" />
+				<xs:element name="descriptorScript" type="script" minOccurs="0" maxOccurs="1" />
+				<xs:element name="form" type="vitruvio-mobile-form" minOccurs="1"
+					maxOccurs="unbounded" />
 			</xs:sequence>
-            <xs:attribute name="requiredDurationNotes" type="xs:boolean" />
-            <xs:attribute name="shouldDisplayNextTask" type="xs:boolean" />
-            <xs:attribute name="shouldDisplayNextTaskWithoutConfirmation" type="xs:boolean" />
-            <xs:attribute name="shouldRefreshTasksFromBackendAfterEnd" type="xs:boolean" />
-		</xs:extension>
-	</xs:complexContent>
-</xs:complexType>
-
-<xs:element name="mobile-forms">
-	<xs:complexType>
-		<xs:sequence>
-			<xs:element name="library" type="library" minOccurs="0" maxOccurs="1" />
-			<xs:element name="descriptorScript" type="script" minOccurs="0" maxOccurs="1" />
-			<xs:element name="form" type="vitruvio-mobile-form" minOccurs="1" maxOccurs="unbounded" />
-		</xs:sequence>
-		<xs:attribute name="processKey" type="xs:string" />
-		<xs:attribute name="allowAttachments" type="xs:boolean" />
-		<!-- Determina se as notas e anexos devem ser exibidas dentro do mesmo form, ou atraves de formularios externos -->
-		<xs:attribute name="embeddedNotes" type="xs:boolean" />
-		<xs:attribute name="embeddedAttachments" type="xs:boolean" />
-	</xs:complexType>
-</xs:element>
+			<xs:attribute name="processKey" type="xs:string" />
+			<xs:attribute name="allowAttachments" type="xs:boolean" />
+			<!-- Determina se as notas e anexos devem ser exibidas dentro do mesmo form, ou atraves
+			de formularios externos -->
+			<xs:attribute name="embeddedNotes" type="xs:boolean" />
+			<xs:attribute name="embeddedAttachments" type="xs:boolean" />
+		</xs:complexType>
+	</xs:element>
 
 </xs:schema>
diff --git a/vitruvio-mobile-widgets.xsd b/vitruvio-mobile-widgets.xsd
index 6a096f7..6887797 100644
--- a/vitruvio-mobile-widgets.xsd
+++ b/vitruvio-mobile-widgets.xsd
@@ -1,106 +1,161 @@
 <?xml version="1.0"?>
-<xs:schema  xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-	
-<!-- 
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+
+	<!-- 
 	
 	Componentes basicos para uso nos formularios do Vitruvio
 
  -->
 
-<!-- Parametros comuns nos Campos -->
-<xs:include schemaLocation="vitruvio-form-common-attrs.xsd" />
-<xs:include schemaLocation="vitruvio-form-scripting.xsd" />
-<xs:include schemaLocation="vitruvio-form-db-components.xsd" />
+	<!-- Parametros comuns nos Campos -->
+	<xs:include schemaLocation="vitruvio-form-common-attrs.xsd" />
+	<xs:include schemaLocation="vitruvio-form-scripting.xsd" />
+	<xs:include schemaLocation="vitruvio-form-db-components.xsd" />
+
+	<xs:complexType name="GridEditorWidgetDataSource">
+		<xs:choice>
+			<xs:element name="scriptLoader" type="script" minOccurs="0" maxOccurs="1" />
+			<xs:element name="query" minOccurs="0" maxOccurs="1">
+				<xs:complexType>
+					<xs:attribute name="key" type="xs:string" use="required" />
+				</xs:complexType>
+			</xs:element>
+		</xs:choice>
+	</xs:complexType>
+
+	<xs:complexType name="GridEditorEvents">
+		<xs:sequence>
+			<xs:element name="onChange" type="script" minOccurs="0" maxOccurs="1" />
+			<xs:element name="onRowCreated" type="script" minOccurs="0" maxOccurs="1" />
+			<xs:element name="onRowRemoved" type="script" minOccurs="0" maxOccurs="1" />
+		</xs:sequence>
+	</xs:complexType>
 
-<xs:complexType name="GridEditorWidgetDataSource">
-	<xs:choice>
-		<xs:element name="scriptLoader" type="script" minOccurs="0" maxOccurs="1" />
-		<xs:element name="query" minOccurs="0" maxOccurs="1">
-			<xs:complexType>
-				<xs:attribute name="key" type="xs:string" use="required" />
-			</xs:complexType>
-		</xs:element>
-	</xs:choice>
-</xs:complexType>
+	<xs:complexType name="GridEditorColumns">
+		<xs:sequence>
+			<xs:element name="column" minOccurs="1" maxOccurs="unbounded">
+				<xs:complexType>
+					<xs:attribute name="name" type="xs:string" use="required" />
+					<xs:attribute name="type" use="required">
+						<xs:simpleType>
+							<xs:restriction base="xs:string">
+								<xs:enumeration value="string" />
+								<xs:enumeration value="numeric" />
+								<xs:enumeration value="decimal" />
+								<xs:enumeration value="date" />
+								<xs:enumeration value="boolean" />
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:attribute>
+					<xs:attribute name="caption" type="xs:string" />
+					<xs:attribute name="format" type="xs:string" />
+					<xs:attribute name="width" type="xs:positiveInteger" />
+					<xs:attribute name="editable" type="xs:boolean" />
+				</xs:complexType>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
 
-<xs:complexType name="GridEditorEvents">
-	<xs:sequence>
-		<xs:element name="onChange" type="script" minOccurs="0" maxOccurs="1" />
-		<xs:element name="onRowCreated" type="script" minOccurs="0" maxOccurs="1" />
-		<xs:element name="onRowRemoved" type="script" minOccurs="0" maxOccurs="1" />
-	</xs:sequence>
-</xs:complexType>
+	<xs:complexType name="GridEditors">
+		<xs:sequence>
+			<xs:element name="field">
+				<xs:complexType>
+					<xs:sequence maxOccurs="1" minOccurs="1">
+						<xs:any />
+					</xs:sequence>
+					<xs:attribute name="key" type="xs:string" use="required" />
+				</xs:complexType>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
 
-<xs:complexType name="GridEditorColumns">
-	<xs:sequence>
-		<xs:element name="column" minOccurs="1" maxOccurs="unbounded">
-			<xs:complexType>
-				<xs:attribute name="name" type="xs:string" use="required" />
-				<xs:attribute name="type" use="required">
+	<xs:complexType name="GridEditorWidget">
+		<xs:sequence>
+			<xs:element name="datasource" minOccurs="1" maxOccurs="1"
+				type="GridEditorWidgetDataSource" />
+			<xs:element name="keyField" minOccurs="1" maxOccurs="1" />
+			<xs:element name="parentKeyField" minOccurs="1" maxOccurs="1" />
+			<xs:element name="freezeCount" minOccurs="1" maxOccurs="1" />
+			<xs:element name="events" minOccurs="0" maxOccurs="1" type="GridEditorEvents" />
+			<xs:element name="editorSelectorScript" type="script" minOccurs="0" maxOccurs="1" />
+			<xs:element name="cellStyleGeneratorScript" type="script" minOccurs="0" maxOccurs="1" />
+			<xs:element name="columns" type="GridEditorColumns" minOccurs="0" maxOccurs="1" />
+			<xs:element name="editors" type="GridEditors" minOccurs="0" maxOccurs="1" />
+		</xs:sequence>
+		<xs:attributeGroup ref="basicElement" />
+	</xs:complexType>
+
+	<xs:complexType name="ProgressBarLinear">
+		<xs:attribute name="id" type="xs:string" />
+		<xs:attribute name="enabled" type="xs:boolean" default="true" />
+		<xs:attribute name="value" type="xs:float" />
+		<xs:attribute name="maxValue" type="xs:float" />
+		<xs:attribute name="color" type="xs:string" />
+		<xs:attribute name="stroke" type="xs:int" />
+		<xs:attribute name="radius" type="xs:int" />
+		<xs:attribute name="resolution" default="">
+			<xs:simpleType>
+				<xs:restriction base="xs:string">
+					<xs:enumeration value="" />
+					<xs:enumeration value="TIMESTAMP" />
+				</xs:restriction>
+			</xs:simpleType>
+		</xs:attribute>
+		<xs:attributeGroup ref="basicElement" />
+	</xs:complexType>
+
+	<xs:complexType name="BarCodeEventType">
+		<xs:simpleContent>
+			<xs:extension base="xs:string">
+				<xs:attribute name="key" use="required">
 					<xs:simpleType>
 						<xs:restriction base="xs:string">
-			      			<xs:enumeration value="string"/>
-			      			<xs:enumeration value="numeric"/>
-			      			<xs:enumeration value="decimal"/>
-			      			<xs:enumeration value="date"/>
-			      			<xs:enumeration value="boolean"/>
-			    		</xs:restriction>
+							<xs:enumeration value="valueChange" />
+							<xs:enumeration value="blur" />
+							<xs:enumeration value="focus" />
+						</xs:restriction>
 					</xs:simpleType>
 				</xs:attribute>
-				<xs:attribute name="caption" type="xs:string" />
-				<xs:attribute name="format" type="xs:string" />
-				<xs:attribute name="width" type="xs:positiveInteger" />
-				<xs:attribute name="editable" type="xs:boolean" />
-			</xs:complexType>
-		</xs:element>
-	</xs:sequence>
-</xs:complexType>
-
-<xs:complexType name="GridEditors">
-	<xs:sequence>
-		<xs:element name="field">
-			<xs:complexType>
-				<xs:sequence maxOccurs="1" minOccurs="1">
-					<xs:any />
-				</xs:sequence>
-			<xs:attribute name="key" type="xs:string" use="required" />
-			</xs:complexType>
-		</xs:element>
-	</xs:sequence>
-</xs:complexType>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
 
-<xs:complexType name="GridEditorWidget">
-	<xs:sequence>
-		<xs:element name="datasource" minOccurs="1" maxOccurs="1" type="GridEditorWidgetDataSource" />
-		<xs:element name="keyField" minOccurs="1" maxOccurs="1" />
-		<xs:element name="parentKeyField" minOccurs="1" maxOccurs="1" />
-		<xs:element name="freezeCount" minOccurs="1" maxOccurs="1" />
-		<xs:element name="events" minOccurs="0" maxOccurs="1" type="GridEditorEvents" />
-		<xs:element name="editorSelectorScript" type="script" minOccurs="0" maxOccurs="1" />
-		<xs:element name="cellStyleGeneratorScript" type="script" minOccurs="0" maxOccurs="1" />
-		<xs:element name="columns" type="GridEditorColumns" minOccurs="0" maxOccurs="1" />
-		<xs:element name="editors" type="GridEditors" minOccurs="0" maxOccurs="1" />
-	</xs:sequence>
-	<xs:attributeGroup ref="basicElement" />
-</xs:complexType>
+	<xs:complexType name="Barcode">
+		<xs:sequence>
+			<xs:element name="events" minOccurs="0" maxOccurs="1">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="event" type="BarCodeEventType" minOccurs="0"
+							maxOccurs="unbounded" />
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+		</xs:sequence>
 
-<xs:complexType name="ProgressBarLinear">
-	<xs:attribute name="id" type="xs:string" />
-	<xs:attribute name="enabled" type="xs:boolean" default="true" />
-	<xs:attribute name="value" type="xs:float" />
-	<xs:attribute name="maxValue" type="xs:float" />
-	<xs:attribute name="color" type="xs:string" />
-	<xs:attribute name="stroke" type="xs:int" />
-	<xs:attribute name="radius" type="xs:int" />
-	<xs:attribute name="resolution" default="">
-		<xs:simpleType>
-			<xs:restriction base="xs:string">
-				<xs:enumeration value="" />
-				<xs:enumeration value="TIMESTAMP" />
-			</xs:restriction>
-		</xs:simpleType>
-	</xs:attribute>
-	<xs:attributeGroup ref="basicElement" />
-</xs:complexType>
+		<xs:attributeGroup ref="basicElement" />
+		<xs:attribute name="id" use="required" type="xs:string" />
+		<xs:attribute name="type" use="required">
+			<xs:simpleType>
+				<xs:restriction base="xs:string">
+					<xs:enumeration value="string" />
+					<xs:enumeration value="number" />
+				</xs:restriction>
+			</xs:simpleType>
+		</xs:attribute>
+		<xs:attribute name="readOnly" type="xs:boolean" default="false" />
+		<xs:attribute name="enabled" type="xs:boolean" default="true" />
+		<xs:attribute name="description" type="xs:string" />
+		<xs:attribute name="prefix" type="xs:string" />
+		<xs:attribute name="suffix" type="xs:string" />
+		<xs:attribute name="titleField" type="xs:string" default="Leitor" />
+		<xs:attribute name="descriptionField" type="xs:string"
+			default="Por favor, aponte sua câmera para o código." />
+		<xs:attribute name="allowPaste" type="xs:boolean" default="true" />
+		<xs:attribute name="focusNextFieldOnValueChange" type="xs:boolean" default="true" />
+		<xs:attribute name="focusNextFieldOnEnter" type="xs:boolean" default="false" />
+		<xs:attribute name="formats" type="xs:string" default="EAN_13,QR_CODE" />
+		<xs:attribute name="prefixAndSuffixValidation" type="xs:string" />
+		<xs:attribute name="allowElevationForGroups" type="xs:string" />
+	</xs:complexType>
 
 </xs:schema>