Modified: ofbiz/trunk/applications/workeffort/minilang/permission/WorkEffortPermissionServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/minilang/permission/WorkEffortPermissionServices.xml?rev=1750647&r1=1750646&r2=1750647&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/minilang/permission/WorkEffortPermissionServices.xml (original) +++ ofbiz/trunk/applications/workeffort/minilang/permission/WorkEffortPermissionServices.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";> + xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <simple-method method-name="workEffortManagerPermission" short-description="Check user has WorkEffort Manager permission"> <set field="primaryPermission" value="WORKEFFORTMGR"/>
Modified: ofbiz/trunk/applications/workeffort/minilang/timesheet/TimesheetServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/minilang/timesheet/TimesheetServices.xml?rev=1750647&r1=1750646&r2=1750647&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/minilang/timesheet/TimesheetServices.xml (original) +++ ofbiz/trunk/applications/workeffort/minilang/timesheet/TimesheetServices.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";> + xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <!-- Timesheet Services --> <simple-method method-name="createTimesheet" short-description="Create Timesheet"> Modified: ofbiz/trunk/applications/workeffort/minilang/workeffort/UpgradeServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/minilang/workeffort/UpgradeServices.xml?rev=1750647&r1=1750646&r2=1750647&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/minilang/workeffort/UpgradeServices.xml (original) +++ ofbiz/trunk/applications/workeffort/minilang/workeffort/UpgradeServices.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";> + xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <simple-method method-name="migrateWorkEffortContactMech" short-description="Migrate data from OldWorkEffortContactMech to WorkEffortContactMech"> <entity-condition entity-name="OldWorkEffortContactMech" list="oldWorkEffortContactMechs"/> Modified: ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml?rev=1750647&r1=1750646&r2=1750647&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml (original) +++ ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";> + xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <simple-method method-name="createWorkEffortAndPartyAssign" short-description="Create Work Effort and assign to a party with a role"> <set-service-fields service-name="createWorkEffort" map="parameters" to-map="create"/> Modified: ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkflowMapProcessors.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkflowMapProcessors.xml?rev=1750647&r1=1750646&r2=1750647&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkflowMapProcessors.xml (original) +++ ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkflowMapProcessors.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> <simple-map-processors xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";> + xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <simple-map-processor name="assignmentMap"> <process field="workEffortId"><copy/><not-empty><fail-property resource="WorkEffortUiLabels" property="WorkEffortIdMissing"/></not-empty></process> <process field="partyId"><copy/><not-empty><fail-property resource="PartyUiLabels" property="PartyPartyIdMissing"/></not-empty></process> Modified: ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkflowSimpleEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkflowSimpleEvents.xml?rev=1750647&r1=1750646&r2=1750647&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkflowSimpleEvents.xml (original) +++ ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkflowSimpleEvents.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";> + xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <simple-method method-name="acceptAssignment" short-description="Create Work Effort"> <call-map-processor xml-resource="component://workeffort/minilang/workeffort/WorkflowMapProcessors.xml" processor-name="assignmentMap" in-map-name="parameters" out-map-name="context"/> Modified: ofbiz/trunk/framework/common/minilang/CdyneServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/minilang/CdyneServices.xml?rev=1750647&r1=1750646&r2=1750647&view=diff ============================================================================== --- ofbiz/trunk/framework/common/minilang/CdyneServices.xml (original) +++ ofbiz/trunk/framework/common/minilang/CdyneServices.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";> + xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <simple-method method-name="cdynePostalAddressFillInCounty" short-description="Cdyne PostalAddress Fill In County"> <entity-one entity-name="PostalAddress" value-field="postalAddress"/> <log level="verbose" message="In cdynePostalAddressFillInCounty contactMechId=${parameters.contactMechId}; postalAddress=${postalAddress}"/> Modified: ofbiz/trunk/framework/common/minilang/CommonServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/minilang/CommonServices.xml?rev=1750647&r1=1750646&r2=1750647&view=diff ============================================================================== --- ofbiz/trunk/framework/common/minilang/CommonServices.xml (original) +++ ofbiz/trunk/framework/common/minilang/CommonServices.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";> + xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <simple-method method-name="commonGenericPermission" short-description="Main permission logic"> <set field="primaryPermission" value="COMMON"/> <call-simple-method method-name="genericBasePermissionCheck" xml-resource="component://common/minilang/permission/CommonPermissionServices.xml"/> Modified: ofbiz/trunk/framework/common/minilang/PortalPageMethods.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/minilang/PortalPageMethods.xml?rev=1750647&r1=1750646&r2=1750647&view=diff ============================================================================== --- ofbiz/trunk/framework/common/minilang/PortalPageMethods.xml (original) +++ ofbiz/trunk/framework/common/minilang/PortalPageMethods.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";> + xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <simple-method method-name="setPortalPortletAttributes" short-description="Sets a PortalPortlet attributes"> <if-not-empty field="parameters"> Modified: ofbiz/trunk/framework/common/minilang/PortalPageServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/minilang/PortalPageServices.xml?rev=1750647&r1=1750646&r2=1750647&view=diff ============================================================================== --- ofbiz/trunk/framework/common/minilang/PortalPageServices.xml (original) +++ ofbiz/trunk/framework/common/minilang/PortalPageServices.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";> + xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <simple-method method-name="movePortletToPortalPage" short-description="Moves a PortalPortlet from the actual portalPage to a different one"> <call-simple-method method-name="checkOwnerShip"/> Modified: ofbiz/trunk/framework/common/minilang/email/EmailServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/minilang/email/EmailServices.xml?rev=1750647&r1=1750646&r2=1750647&view=diff ============================================================================== --- ofbiz/trunk/framework/common/minilang/email/EmailServices.xml (original) +++ ofbiz/trunk/framework/common/minilang/email/EmailServices.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";> + xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <simple-method method-name="sendMailFromTemplateSetting" short-description="Send Mail from Email Template Setting"> <!-- if partyIdTo provided but no emailAddress, get it from the partyContactMech --> <if-empty field="parameters.sendTo"> Modified: ofbiz/trunk/framework/common/minilang/period/PeriodServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/minilang/period/PeriodServices.xml?rev=1750647&r1=1750646&r2=1750647&view=diff ============================================================================== --- ofbiz/trunk/framework/common/minilang/period/PeriodServices.xml (original) +++ ofbiz/trunk/framework/common/minilang/period/PeriodServices.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";> + xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <!-- CustomTimePeriod Services --> <simple-method method-name="createCustomTimePeriod" short-description="Create a CustomTimePeriod"> <check-permission permission="PERIOD_MAINT"> Modified: ofbiz/trunk/framework/common/minilang/permission/CommonPermissionServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/minilang/permission/CommonPermissionServices.xml?rev=1750647&r1=1750646&r2=1750647&view=diff ============================================================================== --- ofbiz/trunk/framework/common/minilang/permission/CommonPermissionServices.xml (original) +++ ofbiz/trunk/framework/common/minilang/permission/CommonPermissionServices.xml Wed Jun 29 14:06:29 2016 @@ -18,7 +18,7 @@ under the License. --> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";> + xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <simple-method method-name="genericBasePermissionCheck" short-description="Basic Permission check"> <!-- allow mainAction to be set from outside methods or direct to the service --> Modified: ofbiz/trunk/framework/common/minilang/test/UserLoginTests.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/minilang/test/UserLoginTests.xml?rev=1750647&r1=1750646&r2=1750647&view=diff ============================================================================== --- ofbiz/trunk/framework/common/minilang/test/UserLoginTests.xml (original) +++ ofbiz/trunk/framework/common/minilang/test/UserLoginTests.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ --> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";> + xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <simple-method method-name="testCreateUserLogin" short-description="Test case for service createUserLogin" login-required="false"> <set field="userLoginId" value="demo.person"/> Modified: ofbiz/trunk/framework/entity/minilang/EntityUtilPropertiesTests.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/minilang/EntityUtilPropertiesTests.xml?rev=1750647&r1=1750646&r2=1750647&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/minilang/EntityUtilPropertiesTests.xml (original) +++ ofbiz/trunk/framework/entity/minilang/EntityUtilPropertiesTests.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";> + xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <simple-method method-name="testGetGeneralProperties" short-description="test getting general properties" login-required="false"> <call-class-method ret-field="currencyUomIdDefault" method-name="getPropertyValue" class-name="org.ofbiz.entity.util.EntityUtilProperties"> Modified: ofbiz/trunk/framework/entityext/minilang/EntitySyncServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/minilang/EntitySyncServices.xml?rev=1750647&r1=1750646&r2=1750647&view=diff ============================================================================== --- ofbiz/trunk/framework/entityext/minilang/EntitySyncServices.xml (original) +++ ofbiz/trunk/framework/entityext/minilang/EntitySyncServices.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";> + xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <simple-method method-name="createEntitySync" short-description="Create a EntitySync"> <check-permission permission="ENTITY_SYNC" action="_CREATE"> <fail-property resource="CommonUiLabels" property="CommonGenericPermissionError"/> Modified: ofbiz/trunk/framework/minilang/dtd/minilang-catalog.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/dtd/minilang-catalog.xml?rev=1750647&r1=1750646&r2=1750647&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/dtd/minilang-catalog.xml (original) +++ ofbiz/trunk/framework/minilang/dtd/minilang-catalog.xml Wed Jun 29 14:06:29 2016 @@ -27,6 +27,5 @@ under the License. <!-- <public publicId="-//W3C//DTD SVG 1.0//EN" uri="svg10.dtd"/> --> <system systemId="http://ofbiz.apache.org/dtds/simple-methods.xsd"; uri="simple-methods.xsd" /> - <system systemId="http://ofbiz.apache.org/dtds/simple-methods-ns.xsd"; uri="simple-methods-ns.xsd" /> </catalog> Modified: ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd?rev=1750647&r1=1750646&r2=1750647&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd (original) +++ ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd Wed Jun 29 14:06:29 2016 @@ -17,7 +17,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"; elementFormDefault="qualified"> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"; elementFormDefault="qualified" xmlns="http://ofbiz.apache.org/Simple-Method"; targetNamespace="http://ofbiz.apache.org/Simple-Method";> <!-- ================================================== ========== The Simple Methods Section ========== @@ -84,14 +84,20 @@ under the License. </xs:simpleType> <xs:simpleType name="javaClassName"> + <xs:annotation> + <xs:documentation> + The Java data type. + + Optional. Attribute type: constant. Attribute must contain a valid Java class name. + </xs:documentation> + </xs:annotation> <xs:restriction base="xs:token"> <xs:pattern value="[a-zA-Z_]{1}[a-zA-Z0-9_$.]+" /> </xs:restriction> </xs:simpleType> <!-- Reusable attributes and attribute groups --> - - <xs:attribute name="field"> + <xs:simpleType name="fieldType"> <xs:annotation> <xs:documentation> The name of the field to set. The target of the assignment. @@ -99,14 +105,12 @@ under the License. Required. Attribute type: expression. </xs:documentation> </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:minLength value="1" /> - </xs:restriction> - </xs:simpleType> - </xs:attribute> + <xs:restriction base="xs:token"> + <xs:minLength value="1" /> + </xs:restriction> + </xs:simpleType> - <xs:attribute name="error-list-name" type="xs:string"> + <xs:simpleType name="error-list-name"> <xs:annotation> <xs:documentation> The name of the error message list. It will be created if it does not exist. @@ -115,19 +119,11 @@ under the License. Optional. Attribute types: constant, ${expression}. </xs:documentation> </xs:annotation> - </xs:attribute> - - <xs:attribute name="type" type="javaClassName"> - <xs:annotation> - <xs:documentation> - The Java data type. - - Optional. Attribute type: constant. Attribute must contain a valid Java class name. - </xs:documentation> - </xs:annotation> - </xs:attribute> + <xs:restriction base="xs:string"> + </xs:restriction> + </xs:simpleType> - <xs:attributeGroup name="attlist.operatorRequired"> + <xs:complexType name="attlist.operatorRequired"> <xs:attribute name="operator" use="required"> <xs:annotation> <xs:documentation> @@ -152,9 +148,9 @@ under the License. </xs:restriction> </xs:simpleType> </xs:attribute> - </xs:attributeGroup> + </xs:complexType> - <xs:attributeGroup name="attlist.operatorOptionalRvalue"> + <xs:complexType name="attlist.operatorOptionalRvalue"> <xs:attribute name="operator" use="required"> <xs:annotation> <xs:documentation> @@ -185,9 +181,9 @@ under the License. </xs:restriction> </xs:simpleType> </xs:attribute> - </xs:attributeGroup> + </xs:complexType> - <xs:attributeGroup name="attlist.check-permission"> + <xs:complexType name="attlist.check-permission"> <xs:attribute name="permission" type="xs:string" use="required"> <xs:annotation> <xs:documentation> @@ -208,9 +204,9 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - </xs:attributeGroup> + </xs:complexType> - <xs:attribute name="delegator-name" type="xs:string"> + <xs:simpleType name="delegator-name"> <xs:annotation> <xs:documentation> An alternate delegator name. When specified, the entity operation will use the @@ -219,7 +215,8 @@ under the License. Optional. Attribute types: constant, ${expression}. </xs:documentation> </xs:annotation> - </xs:attribute> + <xs:restriction base="xs:string"/> + </xs:simpleType> <!-- ============================= @@ -482,7 +479,7 @@ under the License. <xs:element ref="fail-message" /> <xs:element ref="fail-property" /> </xs:choice> - <xs:attribute ref="error-list-name"/> + <xs:attribute name="error-list-name" type="error-list-name"/> </xs:complexType> </xs:element> @@ -503,7 +500,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="error-list-name"/> + <xs:attribute name="error-list-name" type="error-list-name"/> </xs:complexType> </xs:element> @@ -531,7 +528,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="error-list-name" /> + <xs:attribute name="error-list-name" type="error-list-name"/> </xs:complexType> </xs:element> @@ -547,24 +544,30 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:sequence> - <xs:element name="alt-permission" minOccurs="0" maxOccurs="unbounded"> - <xs:annotation> - <xs:documentation> - Declares an alternate permission. Alternate permissions are checked when the primary permission check fails. - </xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:attributeGroup ref="attlist.check-permission" /> - </xs:complexType> - </xs:element> - <xs:choice> - <xs:element ref="fail-message" /> - <xs:element ref="fail-property" /> - </xs:choice> - </xs:sequence> - <xs:attributeGroup ref="attlist.check-permission" /> - <xs:attribute ref="error-list-name" /> + <xs:complexContent> + <xs:extension base="attlist.check-permission"> + <xs:sequence> + <xs:element name="alt-permission" minOccurs="0" maxOccurs="unbounded"> + <xs:annotation> + <xs:documentation> + Declares an alternate permission. Alternate permissions are checked when the primary permission check fails. + </xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:complexContent> + <xs:extension base="attlist.check-permission"> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:choice> + <xs:element ref="fail-message" /> + <xs:element ref="fail-property" /> + </xs:choice> + </xs:sequence> + <xs:attribute name="error-list-name" type="error-list-name"/> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> @@ -575,7 +578,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="field" use="required" /> + <xs:attribute name="field" type="fieldType" use="required" /> </xs:complexType> </xs:element> @@ -594,7 +597,7 @@ under the License. <xs:element ref="field" /> <xs:element ref="string" /> </xs:choice> - <xs:attribute ref="field" use="required" /> + <xs:attribute name="field" type="fieldType" use="required" /> <xs:attribute name="class-name" type="javaClassName" use="required"> <xs:annotation> <xs:documentation> @@ -671,7 +674,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="type"> + <xs:attribute name="type" type="javaClassName"> <xs:annotation> <xs:documentation> The Java class of the argument. Defaults to "java.lang.String". @@ -905,7 +908,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="field" use="required" /> + <xs:attribute name="field" type="fieldType" use="required" /> <xs:attribute name="type"> <xs:annotation> <xs:documentation> @@ -935,7 +938,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="field" use="required" /> + <xs:attribute name="field" type="fieldType" use="required" /> </xs:complexType> </xs:element> @@ -947,7 +950,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="field" use="required" /> + <xs:attribute name="field" type="fieldType" use="required" /> </xs:complexType> </xs:element> @@ -999,7 +1002,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="field" use="required" /> + <xs:attribute name="field" type="fieldType" use="required" /> <xs:attribute type="xs:string" name="resource" use="required"> <xs:annotation> <xs:documentation> @@ -1106,7 +1109,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="field" use="required" /> + <xs:attribute name="field" type="fieldType" use="required" /> <xs:attribute type="xs:string" name="request-name"> <xs:annotation> <xs:documentation> @@ -1136,7 +1139,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="field" use="required" /> + <xs:attribute name="field" type="fieldType" use="required" /> <xs:attribute type="xs:string" name="session-name"> <xs:annotation> <xs:documentation> @@ -1165,7 +1168,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="field" use="required" /> + <xs:attribute name="field" type="fieldType" use="required" /> <xs:attribute type="xs:string" name="from"> <xs:annotation> <xs:documentation> @@ -1259,7 +1262,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="field" use="required" /> + <xs:attribute name="field" type="fieldType" use="required" /> <xs:attribute type="xs:string" name="from"> <xs:annotation> <xs:documentation> @@ -1697,7 +1700,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="field" use="required" /> + <xs:attribute name="field" type="fieldType" use="required" /> <xs:attribute type="xs:string" name="resource" use="required"> <xs:annotation> <xs:documentation> @@ -1775,7 +1778,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="error-list-name"/> + <xs:attribute name="error-list-name" type="error-list-name"/> </xs:complexType> </xs:element> @@ -1853,48 +1856,51 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:sequence> - <xs:group minOccurs="0" maxOccurs="unbounded" ref="AllOperations" /> - <xs:element minOccurs="0" ref="else" /> - </xs:sequence> - <xs:attribute type="xs:string" name="field" use="required"> - <xs:annotation> - <xs:documentation> - The name of the field that will be compared. The l-value. - - Required. Attribute type: expression. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attributeGroup ref="attlist.operatorOptionalRvalue" /> - <xs:attribute type="xs:string" name="value" use="required"> - <xs:annotation> - <xs:documentation> - The value that the field will be compared to. The r-value. - - Ignored when the operator attribute equals "is-null", "is-not-null", or "is-empty" - required otherwise. Attribute type: constant+expr. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute ref="type"> - <xs:annotation> - <xs:documentation> - The Java data type. Both values will be converted to this type before comparison. - Invalid when the operator attribute value is "contains". - - Optional. Attribute type: constant. Attribute must contain a valid Java class name. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute type="xs:string" name="format"> - <xs:annotation> - <xs:documentation> - Format used for type conversions. Valid only when the type attribute is not empty. - - Optional. Attribute types: constant, ${expression}. - </xs:documentation> - </xs:annotation> - </xs:attribute> + <xs:complexContent> + <xs:extension base="attlist.operatorOptionalRvalue"> + <xs:sequence> + <xs:group minOccurs="0" maxOccurs="unbounded" ref="AllOperations" /> + <xs:element minOccurs="0" ref="else" /> + </xs:sequence> + <xs:attribute type="xs:string" name="field" use="required"> + <xs:annotation> + <xs:documentation> + The name of the field that will be compared. The l-value. + + Required. Attribute type: expression. + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:string" name="value" use="required"> + <xs:annotation> + <xs:documentation> + The value that the field will be compared to. The r-value. + + Ignored when the operator attribute equals "is-null", "is-not-null", or "is-empty" - required otherwise. Attribute type: constant+expr. + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="type" type="javaClassName"> + <xs:annotation> + <xs:documentation> + The Java data type. Both values will be converted to this type before comparison. + Invalid when the operator attribute value is "contains". + + Optional. Attribute type: constant. Attribute must contain a valid Java class name. + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:string" name="format"> + <xs:annotation> + <xs:documentation> + Format used for type conversions. Valid only when the type attribute is not empty. + + Optional. Attribute types: constant, ${expression}. + </xs:documentation> + </xs:annotation> + </xs:attribute> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> @@ -1906,40 +1912,43 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:sequence> - <xs:group minOccurs="0" maxOccurs="unbounded" ref="AllOperations" /> - <xs:element minOccurs="0" ref="else" /> - </xs:sequence> - <xs:attribute type="xs:string" name="field" use="required"> - <xs:annotation> - <xs:documentation> - The name of the field that will be compared. The l-value. - - Required. Attribute type: expression. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attributeGroup ref="attlist.operatorRequired" /> - <xs:attribute type="xs:string" name="to-field" use="required"> - <xs:annotation> - <xs:documentation> - The name of the field that will be compared to the field specified in the field attribute. - The r-value. - - Required. Attribute type: expression. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute ref="type" /> - <xs:attribute type="xs:string" name="format"> - <xs:annotation> - <xs:documentation> - Format used for type conversions. Valid only when the type attribute is not empty. - - Optional. Attribute types: constant, ${expression}. - </xs:documentation> - </xs:annotation> - </xs:attribute> + <xs:complexContent> + <xs:extension base="attlist.operatorRequired"> + <xs:sequence> + <xs:group minOccurs="0" maxOccurs="unbounded" ref="AllOperations" /> + <xs:element minOccurs="0" ref="else" /> + </xs:sequence> + <xs:attribute type="xs:string" name="field" use="required"> + <xs:annotation> + <xs:documentation> + The name of the field that will be compared. The l-value. + + Required. Attribute type: expression. + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:string" name="to-field" use="required"> + <xs:annotation> + <xs:documentation> + The name of the field that will be compared to the field specified in the field attribute. + The r-value. + + Required. Attribute type: expression. + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="type" type="javaClassName"/> + <xs:attribute type="xs:string" name="format"> + <xs:annotation> + <xs:documentation> + Format used for type conversions. Valid only when the type attribute is not empty. + + Optional. Attribute types: constant, ${expression}. + </xs:documentation> + </xs:annotation> + </xs:attribute> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> @@ -1976,11 +1985,14 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:sequence> - <xs:group minOccurs="0" maxOccurs="unbounded" ref="AllOperations" /> - <xs:element minOccurs="0" ref="else" /> - </xs:sequence> - <xs:attributeGroup ref="attlist.check-permission" /> + <xs:complexContent> + <xs:extension base="attlist.check-permission"> + <xs:sequence> + <xs:group minOccurs="0" maxOccurs="unbounded" ref="AllOperations" /> + <xs:element minOccurs="0" ref="else" /> + </xs:sequence> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> @@ -2309,7 +2321,7 @@ under the License. =========================== --> - <xs:attribute name="result-name" type="xs:string"> + <xs:simpleType name="result-name"> <xs:annotation> <xs:documentation> The name of the called service's OUT attribute. @@ -2317,9 +2329,10 @@ under the License. Required. Attribute type: expression. </xs:documentation> </xs:annotation> - </xs:attribute> + <xs:restriction base="xs:string"/> + </xs:simpleType> - <xs:attributeGroup name="attlist.propertyInfoOptional"> + <xs:complexType name="attlist.propertyInfoOptional"> <xs:attribute name="resource" type="xs:string"> <xs:annotation> <xs:documentation> @@ -2338,7 +2351,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - </xs:attributeGroup> + </xs:complexType> <xs:element name="call-bsh" substitutionGroup="CallOperations"> <xs:annotation> @@ -2464,7 +2477,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="error-list-name" /> + <xs:attribute name="error-list-name" type="error-list-name"/> </xs:complexType> </xs:element> @@ -2480,7 +2493,7 @@ under the License. <xs:complexType> <xs:choice minOccurs="0" maxOccurs="unbounded"> <xs:element ref="string" /> - <xs:element ref="field" /> + <xs:element ref="field"/> </xs:choice> <xs:attribute type="xs:string" name="obj-field" use="required"> <xs:annotation> @@ -2529,7 +2542,10 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType mixed="true"> - <xs:attributeGroup ref="attlist.propertyInfoOptional" /> + <xs:complexContent> + <xs:extension base="attlist.propertyInfoOptional"> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> <xs:element name="error-suffix" minOccurs="0"> @@ -2540,7 +2556,10 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType mixed="true"> - <xs:attributeGroup ref="attlist.propertyInfoOptional" /> + <xs:complexContent> + <xs:extension base="attlist.propertyInfoOptional"> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> <xs:element name="success-prefix" minOccurs="0"> @@ -2551,7 +2570,10 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType mixed="true"> - <xs:attributeGroup ref="attlist.propertyInfoOptional" /> + <xs:complexContent> + <xs:extension base="attlist.propertyInfoOptional"> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> <xs:element name="success-suffix" minOccurs="0"> @@ -2562,7 +2584,10 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType mixed="true"> - <xs:attributeGroup ref="attlist.propertyInfoOptional" /> + <xs:complexContent> + <xs:extension base="attlist.propertyInfoOptional"> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> <xs:element name="message-prefix" minOccurs="0"> @@ -2573,7 +2598,10 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType mixed="true"> - <xs:attributeGroup ref="attlist.propertyInfoOptional" /> + <xs:complexContent> + <xs:extension base="attlist.propertyInfoOptional"> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> <xs:element name="message-suffix" minOccurs="0"> @@ -2584,7 +2612,10 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType mixed="true"> - <xs:attributeGroup ref="attlist.propertyInfoOptional" /> + <xs:complexContent> + <xs:extension base="attlist.propertyInfoOptional"> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> <xs:element name="default-message" minOccurs="0"> @@ -2595,7 +2626,10 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType mixed="true"> - <xs:attributeGroup ref="attlist.propertyInfoOptional" /> + <xs:complexContent> + <xs:extension base="attlist.propertyInfoOptional"> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> <xs:choice minOccurs="0" maxOccurs="unbounded"> @@ -2814,7 +2848,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="result-name" use="required" /> + <xs:attribute name="result-name" type="result-name" use="required" /> <xs:attribute type="xs:string" name="field"> <xs:annotation> <xs:documentation> @@ -2835,7 +2869,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="result-name" use="required" /> + <xs:attribute name="result-name" type="result-name" use="required" /> <xs:attribute type="xs:string" name="request-name"> <xs:annotation> <xs:documentation> @@ -2856,7 +2890,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="result-name" use="required" /> + <xs:attribute name="result-name" type="result-name" use="required" /> <xs:attribute type="xs:string" name="session-name"> <xs:annotation> <xs:documentation> @@ -2883,7 +2917,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="result-name" use="required" /> + <xs:attribute name="result-name" type="result-name" use="required" /> <xs:attribute type="xs:string" name="service-result-name"> <xs:annotation> <xs:documentation> @@ -2935,7 +2969,7 @@ under the License. ============================= --> - <xs:attribute type="xs:string" name="began-transaction-name"> + <xs:simpleType name="began-transaction-name"> <xs:annotation> <xs:documentation> The name of the field that contains a Boolean value specifying whether or not a transaction was begun in the current transaction demarcation. @@ -2944,9 +2978,10 @@ under the License. Optional. Attribute type: expression. </xs:documentation> </xs:annotation> - </xs:attribute> + <xs:restriction base="xs:string"></xs:restriction> + </xs:simpleType> - <xs:attributeGroup name="attlist.entityFindOperations"> + <xs:complexType name="attlist.entityFindOperations"> <xs:attribute name="entity-name" type="xs:string" use="required"> <xs:annotation> <xs:documentation> @@ -2996,8 +3031,8 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="delegator-name" /> - </xs:attributeGroup> + <xs:attribute name="delegator-name" type="delegator-name"/> + </xs:complexType> <xs:element name="clear-cache-line" substitutionGroup="EntityValueOperations"> <xs:annotation> @@ -3028,7 +3063,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="delegator-name" /> + <xs:attribute name="delegator-name" type="delegator-name"/> </xs:complexType> </xs:element> @@ -3040,7 +3075,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="delegator-name" /> + <xs:attribute name="delegator-name" type="delegator-name"/> </xs:complexType> </xs:element> @@ -3276,17 +3311,20 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:sequence> - <xs:element maxOccurs="unbounded" ref="field-map" /> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="select-field" /> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="order-by" /> - <xs:choice minOccurs="0"> - <xs:element ref="limit-range" /> - <xs:element ref="limit-view" /> - <xs:element ref="use-iterator" /> - </xs:choice> - </xs:sequence> - <xs:attributeGroup ref="attlist.entityFindOperations"/> + <xs:complexContent> + <xs:extension base="attlist.entityFindOperations"> + <xs:sequence> + <xs:element maxOccurs="unbounded" ref="field-map" /> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="select-field" /> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="order-by" /> + <xs:choice minOccurs="0"> + <xs:element ref="limit-range" /> + <xs:element ref="limit-view" /> + <xs:element ref="use-iterator" /> + </xs:choice> + </xs:sequence> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> @@ -3297,22 +3335,25 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:sequence> - <xs:choice minOccurs="0"> - <xs:element ref="condition-expr"/> - <xs:element ref="condition-list"/> - <xs:element ref="condition-object"/> - </xs:choice> - <xs:element minOccurs="0" ref="having-condition-list"/> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="select-field" /> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="order-by"/> - <xs:choice minOccurs="0"> - <xs:element ref="limit-range"/> - <xs:element ref="limit-view"/> - <xs:element ref="use-iterator"/> - </xs:choice> - </xs:sequence> - <xs:attributeGroup ref="attlist.entityFindOperations"/> + <xs:complexContent> + <xs:extension base="attlist.entityFindOperations"> + <xs:sequence> + <xs:choice minOccurs="0"> + <xs:element ref="condition-expr"/> + <xs:element ref="condition-list"/> + <xs:element ref="condition-object"/> + </xs:choice> + <xs:element minOccurs="0" ref="having-condition-list"/> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="select-field" /> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="order-by"/> + <xs:choice minOccurs="0"> + <xs:element ref="limit-range"/> + <xs:element ref="limit-view"/> + <xs:element ref="use-iterator"/> + </xs:choice> + </xs:sequence> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> @@ -3349,7 +3390,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="delegator-name" /> + <xs:attribute name="delegator-name" type="delegator-name" /> </xs:complexType> </xs:element> @@ -3397,8 +3438,8 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="error-list-name" /> - <xs:attribute ref="delegator-name" /> + <xs:attribute name="error-list-name" type="error-list-name"/> + <xs:attribute name="delegator-name" type="delegator-name" /> </xs:complexType> </xs:element> @@ -3453,7 +3494,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="delegator-name" /> + <xs:attribute name="delegator-name" type="delegator-name" /> </xs:complexType> </xs:element> @@ -3677,7 +3718,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="delegator-name" /> + <xs:attribute name="delegator-name" type="delegator-name" /> </xs:complexType> </xs:element> @@ -3736,7 +3777,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="delegator-name" /> + <xs:attribute name="delegator-name" type="delegator-name" /> </xs:complexType> </xs:element> @@ -4031,7 +4072,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="delegator-name" /> + <xs:attribute name="delegator-name" type="delegator-name" /> </xs:complexType> </xs:element> @@ -4142,7 +4183,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="delegator-name" /> + <xs:attribute name="delegator-name" type="delegator-name" /> </xs:complexType> </xs:element> @@ -4173,7 +4214,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="delegator-name" /> + <xs:attribute name="delegator-name" type="delegator-name" /> </xs:complexType> </xs:element> @@ -4280,7 +4321,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="field" use="required" /> + <xs:attribute name="field" type="fieldType" use="required" /> <xs:attribute type="xs:string" name="stagger-max"> <xs:annotation> <xs:documentation> @@ -4302,7 +4343,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="delegator-name" /> + <xs:attribute name="delegator-name" type="delegator-name" /> </xs:complexType> </xs:element> @@ -4410,7 +4451,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="delegator-name" /> + <xs:attribute name="delegator-name" type="delegator-name" /> </xs:complexType> </xs:element> @@ -4453,7 +4494,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="began-transaction-name" /> + <xs:attribute name="began-transaction-name" type="began-transaction-name" /> </xs:complexType> </xs:element> @@ -4465,7 +4506,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="began-transaction-name" /> + <xs:attribute name="began-transaction-name" type="began-transaction-name" /> </xs:complexType> </xs:element> @@ -4479,7 +4520,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="began-transaction-name" /> + <xs:attribute name="began-transaction-name" type="began-transaction-name" /> </xs:complexType> </xs:element> @@ -4500,7 +4541,9 @@ under the License. ============================== --> - <xs:attribute name="level"> + + + <xs:simpleType name="levelType"> <xs:annotation> <xs:documentation> The logging level to use. @@ -4508,21 +4551,20 @@ under the License. Defaults to "info". Required. Attribute type: constant. - </xs:documentation> + </xs:documentation> </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="info" /> - <xs:enumeration value="verbose" /> - <xs:enumeration value="timing" /> - <xs:enumeration value="important" /> - <xs:enumeration value="warning" /> - <xs:enumeration value="error" /> - <xs:enumeration value="fatal" /> - <xs:enumeration value="always" /> - </xs:restriction> - </xs:simpleType> - </xs:attribute> + <xs:restriction base="xs:token"> + <xs:enumeration value="info" /> + <xs:enumeration value="verbose" /> + <xs:enumeration value="timing" /> + <xs:enumeration value="important" /> + <xs:enumeration value="warning" /> + <xs:enumeration value="error" /> + <xs:enumeration value="fatal" /> + <xs:enumeration value="always" /> + </xs:restriction> + </xs:simpleType> + <xs:element name="log" substitutionGroup="OtherOperations"> <xs:annotation> @@ -4531,7 +4573,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="level" use="required"/> + <xs:attribute name="level" type="levelType" use="required"/> <xs:attribute name="message" type="xs:string" use="required"> <xs:annotation> <xs:documentation> @@ -4552,7 +4594,7 @@ under the License. </xs:annotation> <xs:complexType> <xs:group minOccurs="0" maxOccurs="unbounded" ref="AllOperations" /> - <xs:attribute ref="level" use="required"/> + <xs:attribute name="level" type="levelType" use="required"/> </xs:complexType> </xs:element> @@ -4574,7 +4616,7 @@ under the License. <xs:element ref="calcop" /> <xs:element ref="number" /> </xs:choice> - <xs:attribute ref="field" /> + <xs:attribute name="field" type="fieldType" /> <xs:attribute name="rounding-mode"> <xs:annotation> <xs:documentation> @@ -4811,16 +4853,19 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="make-in-string"/> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="process"/> - </xs:sequence> - <xs:attributeGroup ref="attlist.simple-map-processor"/> + <xs:complexContent> + <xs:extension base="attlist.simple-map-processor"> + <xs:sequence> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="make-in-string"/> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="process"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.simple-map-processor"> + <xs:complexType name="attlist.simple-map-processor"> <xs:attribute type="xs:string" name="name" use="required"/> - </xs:attributeGroup> + </xs:complexType> <!-- Make In String & Operations --> <xs:element name="make-in-string"> <xs:annotation> @@ -4832,17 +4877,20 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="in-field"/> - <xs:element ref="property"/> - <xs:element ref="constant"/> - </xs:choice> - <xs:attributeGroup ref="attlist.make-in-string"/> + <xs:complexContent> + <xs:extension base="attlist.make-in-string"> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="in-field"/> + <xs:element ref="property"/> + <xs:element ref="constant"/> + </xs:choice> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.make-in-string"> + <xs:complexType name="attlist.make-in-string"> <xs:attribute type="xs:string" name="field" use="required"/> - </xs:attributeGroup> + </xs:complexType> <xs:element name="in-field"> <xs:annotation> <xs:documentation> @@ -4850,12 +4898,15 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attributeGroup ref="attlist.in-field"/> + <xs:complexContent> + <xs:extension base="attlist.in-field"> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.in-field"> + <xs:complexType name="attlist.in-field"> <xs:attribute type="xs:string" name="field" use="required"/> - </xs:attributeGroup> + </xs:complexType> <xs:element name="property"> <xs:annotation> <xs:documentation> @@ -4864,10 +4915,13 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attributeGroup ref="attlist.property"/> + <xs:complexContent> + <xs:extension base="attlist.property"> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.property"> + <xs:complexType name="attlist.property"> <xs:attribute type="xs:string" name="resource" use="required"> <xs:annotation> <xs:documentation> @@ -4882,7 +4936,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - </xs:attributeGroup> + </xs:complexType> <xs:element name="constant" type="xs:string"> <xs:annotation> <xs:documentation> @@ -4912,21 +4966,24 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="validate-method"/> - <xs:element ref="compare"/> - <xs:element ref="compare-field"/> - <xs:element ref="regexp"/> - <xs:element ref="not-empty"/> - <xs:element ref="copy"/> - <xs:element ref="convert"/> - </xs:choice> - <xs:attributeGroup ref="attlist.process"/> + <xs:complexContent> + <xs:extension base="attlist.process"> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="validate-method"/> + <xs:element ref="compare"/> + <xs:element ref="compare-field"/> + <xs:element ref="regexp"/> + <xs:element ref="not-empty"/> + <xs:element ref="copy"/> + <xs:element ref="convert"/> + </xs:choice> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.process"> + <xs:complexType name="attlist.process"> <xs:attribute type="xs:string" name="field" use="required"/> - </xs:attributeGroup> + </xs:complexType> <xs:element name="validate-method"> <xs:annotation> <xs:documentation> @@ -4937,17 +4994,20 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:choice> - <xs:element ref="fail-message"/> - <xs:element ref="fail-property"/> - </xs:choice> - <xs:attributeGroup ref="attlist.validate-method"/> + <xs:complexContent> + <xs:extension base="attlist.validate-method"> + <xs:choice> + <xs:element ref="fail-message"/> + <xs:element ref="fail-property"/> + </xs:choice> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.validate-method"> + <xs:complexType name="attlist.validate-method"> <xs:attribute type="xs:string" name="method" use="required"/> <xs:attribute type="xs:string" name="class" default="org.ofbiz.base.util.UtilValidate"/> - </xs:attributeGroup> + </xs:complexType> <xs:element name="compare"> <xs:annotation> <xs:documentation> @@ -4957,31 +5017,31 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:choice> - <xs:element ref="fail-message"/> - <xs:element ref="fail-property"/> - </xs:choice> - <xs:attributeGroup ref="attlist.compare"/> - <xs:attributeGroup ref="attlist.operatorRequired"/> - <xs:attributeGroup ref="attlist.typeDefaultString"/> + <xs:complexContent> + <xs:extension base="attlist.operatorRequired"> + <xs:choice> + <xs:element ref="fail-message"/> + <xs:element ref="fail-property"/> + </xs:choice> + <xs:attribute type="xs:string" name="value" use="required"> + <xs:annotation> + <xs:documentation> + Literal or flexible string using ${} syntax. + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute type="xs:string" name="format"> + <xs:annotation> + <xs:documentation> + Format based on the type of the object (date,number, etc.). + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attributeGroup ref="attlist.typeDefaultString"/> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.compare"> - <xs:attribute type="xs:string" name="value" use="required"> - <xs:annotation> - <xs:documentation> - Literal or flexible string using ${} syntax. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute type="xs:string" name="format"> - <xs:annotation> - <xs:documentation> - Format based on the type of the object (date,number, etc.). - </xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:attributeGroup> <xs:element name="compare-field"> <xs:annotation> <xs:documentation> @@ -4989,25 +5049,25 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:choice> - <xs:element ref="fail-message"/> - <xs:element ref="fail-property"/> - </xs:choice> - <xs:attributeGroup ref="attlist.compare-field"/> - <xs:attributeGroup ref="attlist.operatorRequired"/> - <xs:attributeGroup ref="attlist.typeDefaultString"/> + <xs:complexContent> + <xs:extension base="attlist.operatorRequired"> + <xs:choice> + <xs:element ref="fail-message"/> + <xs:element ref="fail-property"/> + </xs:choice> + <xs:attribute type="xs:string" name="field" use="required"/> + <xs:attribute type="xs:string" name="format"> + <xs:annotation> + <xs:documentation> + Format based on the type of the object (date,number, etc.). + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attributeGroup ref="attlist.typeDefaultString"/> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.compare-field"> - <xs:attribute type="xs:string" name="field" use="required"/> - <xs:attribute type="xs:string" name="format"> - <xs:annotation> - <xs:documentation> - Format based on the type of the object (date,number, etc.). - </xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:attributeGroup> <xs:element name="regexp"> <xs:annotation> <xs:documentation> @@ -5016,16 +5076,19 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:choice> - <xs:element ref="fail-message"/> - <xs:element ref="fail-property"/> - </xs:choice> - <xs:attributeGroup ref="attlist.regexp"/> + <xs:complexContent> + <xs:extension base="attlist.regexp"> + <xs:choice> + <xs:element ref="fail-message"/> + <xs:element ref="fail-property"/> + </xs:choice> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.regexp"> + <xs:complexType name="attlist.regexp"> <xs:attribute type="xs:string" name="expr" use="required"/> - </xs:attributeGroup> + </xs:complexType> <xs:element name="not-empty"> <xs:annotation> <xs:documentation> @@ -5049,10 +5112,13 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attributeGroup ref="attlist.copy"/> + <xs:complexContent> + <xs:extension base="attlist.copy"> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.copy"> + <xs:complexType name="attlist.copy"> <xs:attribute type="xs:string" name="to-field"> <xs:annotation> <xs:documentation> @@ -5089,7 +5155,7 @@ under the License. </xs:restriction> </xs:simpleType> </xs:attribute> - </xs:attributeGroup> + </xs:complexType> <xs:element name="convert"> <xs:annotation> <xs:documentation> @@ -5099,14 +5165,17 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:choice> - <xs:element ref="fail-message"/> - <xs:element ref="fail-property"/> - </xs:choice> - <xs:attributeGroup ref="attlist.convert"/> + <xs:complexContent> + <xs:extension base="attlist.convert"> + <xs:choice> + <xs:element ref="fail-message"/> + <xs:element ref="fail-property"/> + </xs:choice> + </xs:extension> + </xs:complexContent> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.convert"> + <xs:complexType name="attlist.convert"> <xs:attribute type="xs:string" name="to-field"> <xs:annotation> <xs:documentation> @@ -5167,5 +5236,5 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - </xs:attributeGroup> + </xs:complexType> </xs:schema> Modified: ofbiz/trunk/framework/widget/dtd/compound-widgets.xsd URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/dtd/compound-widgets.xsd?rev=1750647&r1=1750646&r2=1750647&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/dtd/compound-widgets.xsd (original) +++ ofbiz/trunk/framework/widget/dtd/compound-widgets.xsd Wed Jun 29 14:06:29 2016 @@ -13,7 +13,7 @@ <xs:import schemaLocation="widget-screen.xsd" namespace="http://ofbiz.apache.org/Widget-Screen"/> <xs:import schemaLocation="widget-form.xsd" namespace="http://ofbiz.apache.org/Widget-Form"/> <xs:import schemaLocation="widget-tree.xsd" namespace="http://ofbiz.apache.org/Widget-Tree"/> - <xs:import schemaLocation="../../minilang/dtd/simple-methods-ns.xsd" namespace="http://ofbiz.apache.org/Simple-Method"/> + <xs:import schemaLocation="../../minilang/dtd/simple-methods.xsd" namespace="http://ofbiz.apache.org/Simple-Method"/> <xs:element name="compound-widgets"> <xs:complexType> Modified: ofbiz/trunk/specialpurpose/assetmaint/minilang/FixedAssetMaintServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/minilang/FixedAssetMaintServices.xml?rev=1750647&r1=1750646&r2=1750647&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/minilang/FixedAssetMaintServices.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/minilang/FixedAssetMaintServices.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ --> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";> + xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <simple-method method-name="createFixedAssetMaintUpdateWorkEffort" login-required="true" short-description="Create FixedAssetMaint and Update Schedule information in WorkEffort"> Modified: ofbiz/trunk/specialpurpose/assetmaint/minilang/test/FixedAssetMaintTests.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/minilang/test/FixedAssetMaintTests.xml?rev=1750647&r1=1750646&r2=1750647&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/minilang/test/FixedAssetMaintTests.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/minilang/test/FixedAssetMaintTests.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";> + xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <simple-method method-name="testCreateFixedAssetMaintUpdateWorkEffortWithProductMaint" short-description="Test case for service createFixedAssetMaintUpdateWorkEffort with a product Maintenance" login-required="false"> <set field="fixedAssetId" value="DEMO_VEHICLE_01"/> Modified: ofbiz/trunk/specialpurpose/bi/minilang/DimensionServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/minilang/DimensionServices.xml?rev=1750647&r1=1750646&r2=1750647&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/bi/minilang/DimensionServices.xml (original) +++ ofbiz/trunk/specialpurpose/bi/minilang/DimensionServices.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";> + xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <simple-method method-name="quickInitDataWarehouse" short-description=""> <set-service-fields service-name="loadDateDimension" map="parameters" to-map="inMap"/> Modified: ofbiz/trunk/specialpurpose/bi/minilang/FactServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/minilang/FactServices.xml?rev=1750647&r1=1750646&r2=1750647&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/bi/minilang/FactServices.xml (original) +++ ofbiz/trunk/specialpurpose/bi/minilang/FactServices.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";> + xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <simple-method method-name="loadSalesInvoiceFact" short-description=""> <entity-one entity-name="Invoice" value-field="invoice"/> Modified: ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayServices.xml?rev=1750647&r1=1750646&r2=1750647&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayServices.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayServices.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ --> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";> + xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <simple-method method-name="createEbayAccount" short-description="Create Ebay Account"> <set-service-fields service-name="createPersonAndUserLogin" to-map="newPerson" map="parameters"/> Modified: ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayStoreEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayStoreEvents.xml?rev=1750647&r1=1750646&r2=1750647&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayStoreEvents.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayStoreEvents.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ --> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";> + xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <simple-method method-name="checkEbayAction" short-description="Check eBay Action"> <set field="resultResponse" from-field="parameters.action"/> <return response-code="${resultResponse}"/> Modified: ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/CustomerEvents.xml?rev=1750647&r1=1750646&r2=1750647&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/CustomerEvents.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/CustomerEvents.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";> + xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <simple-method method-name="createCustomer" short-description="Create Customer" login-required="false"> <call-class-method class-name="org.ofbiz.product.store.ProductStoreWorker" method-name="getProductStore" ret-field="productStore"> Modified: ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/QuickAnonCustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/QuickAnonCustomerEvents.xml?rev=1750647&r1=1750646&r2=1750647&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/QuickAnonCustomerEvents.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/QuickAnonCustomerEvents.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";> + xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <!-- =========================================== --> <!-- ======== Anonymous Checkout Events ======== --> Modified: ofbiz/trunk/specialpurpose/ecommerce/minilang/misc/AffiliateMapProcs.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/minilang/misc/AffiliateMapProcs.xml?rev=1750647&r1=1750646&r2=1750647&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/minilang/misc/AffiliateMapProcs.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/minilang/misc/AffiliateMapProcs.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> <simple-map-processors xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";> + xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <simple-map-processor name="newAffilParty"> <process field="AFFILIATE_ID"><copy to-field="partyId"/><not-empty> <fail-property resource="PartyUiLabels" property="PartyAffiliateCodeMissingError"/></not-empty></process> Modified: ofbiz/trunk/specialpurpose/ecommerce/minilang/misc/AffiliateSimpleEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/minilang/misc/AffiliateSimpleEvents.xml?rev=1750647&r1=1750646&r2=1750647&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/minilang/misc/AffiliateSimpleEvents.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/minilang/misc/AffiliateSimpleEvents.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";> + xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <simple-method method-name="createAffiliate" short-description="Create Affiliate" login-required="false"> <!-- Create the UserLogin Record --> Modified: ofbiz/trunk/specialpurpose/example/minilang/ExamplePermissionServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/minilang/ExamplePermissionServices.xml?rev=1750647&r1=1750646&r2=1750647&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/example/minilang/ExamplePermissionServices.xml (original) +++ ofbiz/trunk/specialpurpose/example/minilang/ExamplePermissionServices.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";> + xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <simple-method method-name="exampleGenericPermission" short-description="Main permission logic"> <set field="mainAction" from-field="parameters.mainAction"/> Modified: ofbiz/trunk/specialpurpose/example/minilang/example/ExampleServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/minilang/example/ExampleServices.xml?rev=1750647&r1=1750646&r2=1750647&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/example/minilang/example/ExampleServices.xml (original) +++ ofbiz/trunk/specialpurpose/example/minilang/example/ExampleServices.xml Wed Jun 29 14:06:29 2016 @@ -19,7 +19,7 @@ under the License. --> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";> + xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <!-- ExampleStatus methods --> <simple-method method-name="createExampleStatus" short-description="create a ExampleItem"> <now-timestamp field="nowTimestamp"/>
