Skip to content

Commit 43500d0

Browse files
authored
Update XML files to use new XSD references for the 3.0.0 release series (#8)
1 parent 60eff1d commit 43500d0

28 files changed

+28
-28
lines changed

MoquiConf.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<!-- No copyright or license for configuration file, details here are not considered a creative work. -->
3-
<moqui-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-2.1.xsd">
3+
<moqui-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-3.xsd">
44
<screen-facade>
55
<screen location="component://webroot/screen/webroot.xml">
66
<subscreens-item name="site" location="component://example/screen/ExampleSite.xml"/>

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
apply plugin: 'groovy'
1616

17-
version = '3.0.0-rc9'
17+
version = '3.0.0'
1818
// sourceCompatibility = '1.8'
1919
def moquiDir = file(projectDir.absolutePath + '/../../..')
2020
def frameworkDir = file(moquiDir.absolutePath + '/framework')

component.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<component xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-2.1.xsd"
2+
<component xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-3.xsd"
33
name="example" version="${moqui_version}">
44
</component>

entity/ExampleEntities.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
1212
along with this software (see the LICENSE.md file). If not, see
1313
<http://creativecommons.org/publicdomain/zero/1.0/>.
1414
-->
15-
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-2.1.xsd">
15+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-3.xsd">
1616

1717
<!-- ========================================================= -->
1818
<!-- example -->

entity/ExampleViewEntities.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
1212
along with this software (see the LICENSE.md file). If not, see
1313
<http://creativecommons.org/publicdomain/zero/1.0/>.
1414
-->
15-
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-2.1.xsd">
15+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-3.xsd">
1616

1717
<view-entity entity-name="ExampleStatusDetail" package="moqui.example">
1818
<member-entity entity-alias="EXPL" entity-name="Example"/>

screen/ExampleApp.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
1313
<http://creativecommons.org/publicdomain/zero/1.0/>.
1414
-->
1515
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16-
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
16+
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
1717
include-child-content="true" require-authentication="false" menu-image="fa fa-flash" menu-image-type="icon">
1818

1919
<!-- To test this try something like:

screen/ExampleApp/Example.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
1313
<http://creativecommons.org/publicdomain/zero/1.0/>.
1414
-->
1515
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16-
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
16+
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
1717
default-menu-title="Example" default-menu-index="1">
1818

1919
<!-- this is a test, and example, of overriding the default FTL macro template to use for this screen -->

screen/ExampleApp/Example/DynamicExampleItems.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
1212
along with this software (see the LICENSE.md file). If not, see
1313
<http://creativecommons.org/publicdomain/zero/1.0/>.
1414
-->
15-
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
15+
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
1616
default-menu-title="Dynamic Items" default-menu-index="9" render-modes="js,vuet" server-static="js,vuet">
1717

1818
<parameter name="exampleId"/>

screen/ExampleApp/Example/DynamicExampleItemsVue.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
1212
along with this software (see the LICENSE.md file). If not, see
1313
<http://creativecommons.org/publicdomain/zero/1.0/>.
1414
-->
15-
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
15+
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
1616
default-menu-title="Dynamic Items Vue" default-menu-index="10" render-modes="vue,qvue" server-static="vue,qvue">
1717

1818
<parameter name="exampleId"/>

screen/ExampleApp/Example/EditExample.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
1212
along with this software (see the LICENSE.md file). If not, see
1313
<http://creativecommons.org/publicdomain/zero/1.0/>.
1414
-->
15-
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
15+
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
1616
default-menu-title="Example" default-menu-index="1">
1717

1818
<parameter name="exampleId" required="true"/>

screen/ExampleApp/Example/EditExampleContent.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
1313
<http://creativecommons.org/publicdomain/zero/1.0/>.
1414
-->
1515
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16-
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
16+
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
1717
default-menu-title="Content" default-menu-index="4">
1818

1919
<parameter name="exampleId" required="true"/>

screen/ExampleApp/Example/EditExampleFeatureAppls.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
1313
<http://creativecommons.org/publicdomain/zero/1.0/>.
1414
-->
1515
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16-
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
16+
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
1717
default-menu-title="Features" default-menu-index="3">
1818

1919
<parameter name="exampleId" required="true"/>

screen/ExampleApp/Example/EditExampleItemList.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
1313
<http://creativecommons.org/publicdomain/zero/1.0/>.
1414
-->
1515
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16-
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
16+
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
1717
default-menu-include="false" standalone="true">
1818

1919
<parameter name="exampleId"/>

screen/ExampleApp/Example/EditExampleItems.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
1313
<http://creativecommons.org/publicdomain/zero/1.0/>.
1414
-->
1515
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16-
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
16+
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
1717
default-menu-title="Items" default-menu-index="2">
1818

1919
<parameter name="exampleId" required="true"/>

screen/ExampleApp/Example/FindExample.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
1212
along with this software (see the LICENSE.md file). If not, see
1313
<http://creativecommons.org/publicdomain/zero/1.0/>.
1414
-->
15-
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
15+
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
1616
default-menu-include="false">
1717

1818
<transition name="findExample"><default-response url="."/></transition>

screen/ExampleApp/Feature.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
1313
<http://creativecommons.org/publicdomain/zero/1.0/>.
1414
-->
1515
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16-
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
16+
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
1717
default-menu-title="Feature" default-menu-index="2">
1818
<subscreens default-item="FindExampleFeature"/>
1919
<widgets>

screen/ExampleApp/Feature/EditExampleFeature.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
1313
<http://creativecommons.org/publicdomain/zero/1.0/>.
1414
-->
1515
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16-
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
16+
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
1717
default-menu-title="Feature" default-menu-index="1">
1818

1919
<parameter name="exampleFeatureId"/>

screen/ExampleApp/Feature/EditExampleFeatureExampleAppls.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
1313
<http://creativecommons.org/publicdomain/zero/1.0/>.
1414
-->
1515
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16-
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
16+
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
1717
default-menu-title="Examples" default-menu-index="2">
1818

1919
<parameter name="exampleFeatureId" required="true"/>

screen/ExampleApp/Feature/FindExampleFeature.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
1313
<http://creativecommons.org/publicdomain/zero/1.0/>.
1414
-->
1515
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16-
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
16+
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
1717
default-menu-include="false">
1818

1919
<transition name="newExampleFeature"><default-response url="../EditExampleFeature"/></transition>

screen/ExampleApp/Survey.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
1313
<http://creativecommons.org/publicdomain/zero/1.0/>.
1414
-->
1515
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16-
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
16+
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
1717
default-menu-title="Survey" default-menu-index="3">
1818

1919
<subscreens default-item="FindSurvey"/>

screen/ExampleApp/Survey/EditSurvey.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
1313
<http://creativecommons.org/publicdomain/zero/1.0/>.
1414
-->
1515
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16-
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
16+
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
1717
default-menu-index="1">
1818

1919
<parameter name="formResponseId" required="true"/>

screen/ExampleApp/Survey/FindSurvey.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
1313
<http://creativecommons.org/publicdomain/zero/1.0/>.
1414
-->
1515
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16-
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
16+
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
1717
default-menu-include="false">
1818

1919
<transition name="createFormResponse">

screen/ExampleSite.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
1313
<http://creativecommons.org/publicdomain/zero/1.0/>.
1414
-->
1515
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16-
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
16+
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
1717
include-child-content="true" require-authentication="false" standalone="true" screen-theme-type-enum-id="STT_POP_COMMERCE">
1818

1919
<subscreens default-item="home"/>

screen/ExampleSite/home.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
1313
<http://creativecommons.org/publicdomain/zero/1.0/>.
1414
-->
1515
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16-
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
16+
xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
1717
require-authentication="false">
1818

1919
<widgets>

script/org/moqui/example/testCreateExampleService.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
1212
along with this software (see the LICENSE.md file). If not, see
1313
<http://creativecommons.org/publicdomain/zero/1.0/>.
1414
-->
15-
<actions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-actions-2.1.xsd">
15+
<actions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-actions-3.xsd">
1616

1717
<service-call name="moqui.example.ExampleServices.createExample"
1818
in-map="createExampleMap" out-map="createExampleResult">

service/Example.emecas.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
1212
along with this software (see the LICENSE.md file). If not, see
1313
<http://creativecommons.org/publicdomain/zero/1.0/>.
1414
-->
15-
<emecas xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/email-eca-2.1.xsd">
15+
<emecas xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/email-eca-3.xsd">
1616
<!-- NOTE: see org.moqui.EmailServices.process#EmailEca interface for fields derived from message, all available for conditions too -->
1717
<emeca rule-name="SaveEcaEmailMessage">
1818
<!-- simple example condition: if message not seen and has a subject save it (note that if EmailServer.storeSkipSeen=Y seen are skipped anyway) -->

service/example.rest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ along with this software (see the LICENSE.md file). If not, see
1515

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

18-
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/rest-api-2.1.xsd"
18+
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/rest-api-3.xsd"
1919
name="example" displayName="Example REST API" version="2.0.0">
2020
<resource name="examples" require-authentication="anonymous-view">
2121
<method type="get"><entity name="examples" operation="list"/></method>

service/moqui/example/ExampleServices.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
1212
along with this software (see the LICENSE.md file). If not, see
1313
<http://creativecommons.org/publicdomain/zero/1.0/>.
1414
-->
15-
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-2.1.xsd">
15+
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-3.xsd">
1616

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

0 commit comments

Comments
 (0)