Skip to content

Commit

Permalink
Updated moqui xsd versions from 1.6 to 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jonesde committed May 8, 2016
1 parent 8c0a8fd commit 120b86d
Show file tree
Hide file tree
Showing 22 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion entity/ExampleEntities.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
along with this software (see the LICENSE.md file). If not, see
<http://creativecommons.org/publicdomain/zero/1.0/>.
-->
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-1.6.xsd">
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-2.0.xsd">

<!-- ========================================================= -->
<!-- example -->
Expand Down
2 changes: 1 addition & 1 deletion entity/ExampleViewEntities.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
along with this software (see the LICENSE.md file). If not, see
<http://creativecommons.org/publicdomain/zero/1.0/>.
-->
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-1.6.xsd">
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-2.0.xsd">

<view-entity entity-name="ExampleStatusDetail" package-name="moqui.example">
<member-entity entity-alias="EXPL" entity-name="Example"/>
Expand Down
2 changes: 1 addition & 1 deletion screen/ExampleApp.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
<http://creativecommons.org/publicdomain/zero/1.0/>.
-->
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-1.6.xsd"
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.0.xsd"
include-child-content="true" require-authentication="false" menu-image="glyphicon glyphicon-flash" menu-image-type="icon">

<!-- To test this try something like:
Expand Down
2 changes: 1 addition & 1 deletion screen/ExampleApp/Example.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
<http://creativecommons.org/publicdomain/zero/1.0/>.
-->
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-1.6.xsd"
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.0.xsd"
default-menu-title="Example" default-menu-index="1">

<!-- this is a test, and example, of overriding the default FTL macro template to use for this screen -->
Expand Down
2 changes: 1 addition & 1 deletion screen/ExampleApp/Example/EditExample.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
<http://creativecommons.org/publicdomain/zero/1.0/>.
-->
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-1.6.xsd"
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.0.xsd"
default-menu-title="Example" default-menu-index="1">

<parameter name="exampleId"/>
Expand Down
2 changes: 1 addition & 1 deletion screen/ExampleApp/Example/EditExampleContent.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
<http://creativecommons.org/publicdomain/zero/1.0/>.
-->
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-1.6.xsd"
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.0.xsd"
default-menu-title="Content" default-menu-index="4">

<parameter name="exampleId" required="true"/>
Expand Down
2 changes: 1 addition & 1 deletion screen/ExampleApp/Example/EditExampleFeatureAppls.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
<http://creativecommons.org/publicdomain/zero/1.0/>.
-->
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-1.6.xsd"
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.0.xsd"
default-menu-title="Features" default-menu-index="3">

<parameter name="exampleId" required="true"/>
Expand Down
2 changes: 1 addition & 1 deletion screen/ExampleApp/Example/EditExampleItemList.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
<http://creativecommons.org/publicdomain/zero/1.0/>.
-->
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-1.6.xsd"
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.0.xsd"
default-menu-include="false" standalone="true">

<parameter name="exampleId"/>
Expand Down
2 changes: 1 addition & 1 deletion screen/ExampleApp/Example/EditExampleItems.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
<http://creativecommons.org/publicdomain/zero/1.0/>.
-->
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-1.6.xsd"
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.0.xsd"
default-menu-title="Items" default-menu-index="2">

<parameter name="exampleId" required="true"/>
Expand Down
2 changes: 1 addition & 1 deletion screen/ExampleApp/Example/FindExample.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
<http://creativecommons.org/publicdomain/zero/1.0/>.
-->
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-1.6.xsd"
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.0.xsd"
default-menu-include="false">

<transition name="newExample"><default-response url="../EditExample"/></transition>
Expand Down
2 changes: 1 addition & 1 deletion screen/ExampleApp/Feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
<http://creativecommons.org/publicdomain/zero/1.0/>.
-->
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-1.6.xsd"
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.0.xsd"
default-menu-title="Feature" default-menu-index="2">
<subscreens default-item="FindExampleFeature"/>
<widgets>
Expand Down
2 changes: 1 addition & 1 deletion screen/ExampleApp/Feature/EditExampleFeature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
<http://creativecommons.org/publicdomain/zero/1.0/>.
-->
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-1.6.xsd"
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.0.xsd"
default-menu-title="Feature" default-menu-index="1">

<parameter name="exampleFeatureId"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
<http://creativecommons.org/publicdomain/zero/1.0/>.
-->
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-1.6.xsd"
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.0.xsd"
default-menu-title="Examples" default-menu-index="2">

<parameter name="exampleFeatureId" required="true"/>
Expand Down
2 changes: 1 addition & 1 deletion screen/ExampleApp/Feature/FindExampleFeature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
<http://creativecommons.org/publicdomain/zero/1.0/>.
-->
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-1.6.xsd"
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.0.xsd"
default-menu-include="false">

<transition name="newExampleFeature"><default-response url="../EditExampleFeature"/></transition>
Expand Down
2 changes: 1 addition & 1 deletion screen/ExampleApp/Survey.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
<http://creativecommons.org/publicdomain/zero/1.0/>.
-->
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-1.6.xsd"
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.0.xsd"
default-menu-title="Survey" default-menu-index="3">

<subscreens default-item="FindSurvey"/>
Expand Down
2 changes: 1 addition & 1 deletion screen/ExampleApp/Survey/EditSurvey.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
<http://creativecommons.org/publicdomain/zero/1.0/>.
-->
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-1.6.xsd"
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.0.xsd"
default-menu-index="1">

<parameter name="formResponseId" required="true"/>
Expand Down
2 changes: 1 addition & 1 deletion screen/ExampleApp/Survey/FindSurvey.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
<http://creativecommons.org/publicdomain/zero/1.0/>.
-->
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-1.6.xsd"
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.0.xsd"
default-menu-include="false">

<transition name="createFormResponse">
Expand Down
2 changes: 1 addition & 1 deletion script/org/moqui/example/testCreateExampleService.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
along with this software (see the LICENSE.md file). If not, see
<http://creativecommons.org/publicdomain/zero/1.0/>.
-->
<actions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-actions-1.6.xsd">
<actions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-actions-2.0.xsd">

<service-call name="moqui.example.ExampleServices.createExample"
in-map="createExampleMap" out-map="createExampleResult">
Expand Down
2 changes: 1 addition & 1 deletion service/Example.emecas.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
along with this software (see the LICENSE.md file). If not, see
<http://creativecommons.org/publicdomain/zero/1.0/>.
-->
<emecas xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/email-eca-1.6.xsd">
<emecas xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/email-eca-2.0.xsd">
<!-- NOTE: see org.moqui.EmailServices.process#EmailEca interface for fields derived from message, all available for conditions too -->
<emeca rule-name="SaveEcaEmailMessage">
<!-- simple example condition: if message not seen and has a subject save it (note that if EmailServer.storeSkipSeen=Y seen are skipped anyway) -->
Expand Down
2 changes: 1 addition & 1 deletion service/Example.secas.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
along with this software (see the LICENSE.md file). If not, see
<http://creativecommons.org/publicdomain/zero/1.0/>.
-->
<secas xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-eca-1.6.xsd">
<secas xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-eca-2.0.xsd">
<!-- this is just an example of what was used for keeping ExampleStatus records; now handled with the audit-log, so
this is no longer needed or used:
<seca service="moqui.example.ExampleServices.updateExample" when="post-commit">
Expand Down
4 changes: 2 additions & 2 deletions service/example.rest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ along with this software (see the LICENSE.md file). If not, see

<!-- General Guideline Verbs: GET=find, POST=create, PUT=store (create or update), PATCH=update, DELETE=delete -->

<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/rest-api-1.6.xsd"
name="example" displayName="Example REST API" version="1.6.3">
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/rest-api-2.0.xsd"
name="example" displayName="Example REST API" version="2.0.0">
<resource name="examples">
<method type="get"><entity name="examples" operation="list"/></method>
<method type="post"><service name="moqui.example.ExampleServices.create#Example"/></method>
Expand Down
2 changes: 1 addition & 1 deletion service/moqui/example/ExampleServices.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
along with this software (see the LICENSE.md file). If not, see
<http://creativecommons.org/publicdomain/zero/1.0/>.
-->
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-1.6.xsd">
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-2.0.xsd">

<!-- Example & Related Services -->
<service verb="create" noun="Example" displayName="Create an Example" type="entity-auto" allow-remote="true">
Expand Down

0 comments on commit 120b86d

Please sign in to comment.