Skip to content

Commit

Permalink
Release 1.1.0 changes (#68)
Browse files Browse the repository at this point in the history
* Update XML files to use new XSD references for the 3.0.0 release series

* In component.xml bump versions for upcoming release
  • Loading branch information
jonesde committed May 31, 2022
1 parent c92369e commit 0a268c4
Show file tree
Hide file tree
Showing 15 changed files with 19 additions and 20 deletions.
2 changes: 1 addition & 1 deletion MoquiConf.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- No copyright or license for configuration file, details here are not considered a creative work. -->
<moqui-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-2.1.xsd">
<moqui-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-3.xsd">
<screen-facade>
<screen location="component://webroot/screen/webroot.xml">
<subscreens-item name="store" menu-title="POP REST Store" menu-include="false"
Expand Down
9 changes: 4 additions & 5 deletions component.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<component xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-2.1.xsd"
name="PopRestStore" version="1.0.1">
<depends-on name="moqui-fop" version="1.1.2"/>
<depends-on name="mantle-udm" version="2.1.2"/>
<depends-on name="mantle-usl" version="2.1.2"/>
<component xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-3.xsd"
name="PopRestStore" version="1.1.0">
<depends-on name="moqui-fop"/>
<depends-on name="mantle-usl" version="2.2.0"/>
</component>
2 changes: 1 addition & 1 deletion screen/store.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/>.
-->
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
standalone="true" require-authentication="anonymous-view" allow-extra-path="true">

<always-actions>
Expand Down
4 changes: 2 additions & 2 deletions screen/store/category.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/>.
-->
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
require-authentication="anonymous-view" allow-extra-path="true">
<parameter name="categoryId"/>
<parameter name="orderBy"/>
Expand Down Expand Up @@ -104,4 +104,4 @@ along with this software (see the LICENSE.md file). If not, see
<render-mode><text type="html" location="${template_server_category}"/></render-mode>
<render-mode><text type="html" location="${template_server_footer}"/></render-mode>
</widgets>
</screen>
</screen>
2 changes: 1 addition & 1 deletion screen/store/content.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/>.
-->
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
require-authentication="anonymous-view" allow-extra-path="true">

<transition name="attachment" read-only="true"><actions>
Expand Down
2 changes: 1 addition & 1 deletion screen/store/d.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/>.
-->
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
require-authentication="anonymous-view" allow-extra-path="true">

<subscreens always-use-full-path="true"/>
Expand Down
2 changes: 1 addition & 1 deletion screen/store/home.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/>.
-->
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
require-authentication="anonymous-view">
<pre-actions>
<set field="star" from="5"/>
Expand Down
2 changes: 1 addition & 1 deletion screen/store/product.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/>.
-->
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
require-authentication="anonymous-view" allow-extra-path="true">
<parameter name="productId"/>
<parameter name="addedCorrect"/>
Expand Down
2 changes: 1 addition & 1 deletion screen/store/search.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/>.
-->
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd" require-authentication="anonymous-view" allow-extra-path="true">
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd" require-authentication="anonymous-view" allow-extra-path="true">
<parameter name="searchParameter"/>
<parameter name="pageIndex"/>
<parameter name="addedCorrect"/>
Expand Down
2 changes: 1 addition & 1 deletion service/pop.rest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ along with this software (see the LICENSE.md file). If not, see

<!-- General Guideline Verbs: GET=find, POST=create/do, 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-2.1.xsd"
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/rest-api-3.xsd"
name="pop" displayName="POP REST Store API" version="1.0.0" description="Services for eCommerce">

<!-- Store Services -->
Expand Down
2 changes: 1 addition & 1 deletion service/popstore/CartServices.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-2.1.xsd">
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-3.xsd">

<!--
General Order Placement and eCommerce Usage
Expand Down
2 changes: 1 addition & 1 deletion service/popstore/CustomerServices.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-2.1.xsd">
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-3.xsd">

<!-- Login and Register for eCommerce -->

Expand Down
2 changes: 1 addition & 1 deletion service/popstore/ProductServices.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-2.1.xsd">
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-3.xsd">

<service verb="get" noun="ProductInfo">
<in-parameters>
Expand Down
2 changes: 1 addition & 1 deletion service/popstore/SearchServices.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-2.1.xsd">
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-3.xsd">

<service verb="search" noun="All">
<in-parameters>
Expand Down
2 changes: 1 addition & 1 deletion service/popstore/StoreServices.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-2.1.xsd">
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-3.xsd">

<service verb="get" noun="ProductStoreIdFromHostName">
<in-parameters>
Expand Down

0 comments on commit 0a268c4

Please sign in to comment.