Skip to content

Commit ca6212b

Browse files
rahulvudutalaMarkLogic Builder
rahulvudutala
authored and
MarkLogic Builder
committed
DHFPROD-9299: Online store example 4.3.2 changes
1 parent 7ca892c commit ca6212b

File tree

7 files changed

+64
-30
lines changed

7 files changed

+64
-30
lines changed

‎examples/online-store/build.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ plugins {
77
// it includes ml-gradle. This plugin is what lets you
88
// run DHF (Data Hub Framework) tasks from the
99
// command line
10-
id 'com.marklogic.ml-data-hub' version '4.0.3'
10+
id 'com.marklogic.ml-data-hub' version '4.3.2'
1111
}
12+

‎examples/online-store/plugins/entities/Order/Order.entity.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
{
22
"info" : {
33
"title" : "Order",
4-
"version" : "0.0.1"
4+
"version" : "0.0.1",
5+
"baseUri":"http://example.org/"
56
},
67
"definitions" : {
78
"Order" : {
89
"primaryKey" : "id",
910
"required" : [ ],
1011
"pii" : [ ],
1112
"elementRangeIndex" : [ "id" ],
12-
"rangeIndex" : [ "id" ],
13+
"rangeIndex" : [ ],
1314
"wordLexicon" : [ ],
1415
"properties" : {
1516
"id" : {

‎examples/online-store/plugins/entities/Product/Product.entity.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"info" : {
33
"title" : "Product",
44
"version" : "0.0.1",
5-
"baseUri" : ""
5+
"baseUri":"http://example.org/"
66
},
77
"definitions" : {
88
"Product" : {

‎examples/online-store/src/main/entity-config/databases/final-database.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"lang" : "zxx",
3+
"path-namespace" : [ {
4+
"prefix" : "es",
5+
"namespace-uri" : "http://marklogic.com/entity-services"
6+
} ],
7+
"range-element-index" : [ {
8+
"invalid-values" : "reject",
9+
"localname" : "id",
10+
"namespace-uri" : null,
11+
"range-value-positions" : false,
12+
"scalar-type" : "string",
13+
"collation" : "http://marklogic.com/collation/codepoint"
14+
} ],
15+
"database-name" : "%%mlFinalDbName%%"
16+
}

‎examples/online-store/src/main/entity-config/databases/staging-database.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"lang" : "zxx",
3+
"path-namespace" : [ {
4+
"prefix" : "es",
5+
"namespace-uri" : "http://marklogic.com/entity-services"
6+
} ],
7+
"range-element-index" : [ {
8+
"invalid-values" : "reject",
9+
"localname" : "id",
10+
"namespace-uri" : null,
11+
"range-value-positions" : false,
12+
"scalar-type" : "string",
13+
"collation" : "http://marklogic.com/collation/codepoint"
14+
} ],
15+
"database-name" : "%%mlStagingDbName%%"
16+
}

‎examples/online-store/src/main/entity-config/final-entity-options.xml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<search:options xmlns:search="http://marklogic.com/appservices/search">
2+
<search:options xml:lang="zxx" xmlns:search="http://marklogic.com/appservices/search">
33
<search:constraint name="Collection">
44
<search:collection/>
55
</search:constraint>
6+
<search:constraint name="createdByJob">
7+
<search:value>
8+
<search:field name="datahubCreatedByJob"/>
9+
</search:value>
10+
</search:constraint>
11+
<search:constraint name="createdByStep">
12+
<search:value>
13+
<search:field name="datahubCreatedByStep"/>
14+
</search:value>
15+
</search:constraint>
616
<search:constraint name="entity-type">
717
<search:value>
818
<search:element ns="http://marklogic.com/entity-services" name="title"/>
@@ -14,27 +24,17 @@
1424
</search:value>
1525
</search:constraint>
1626
<!--The name of this constraint is a duplicate in the generated XML. It is within a comment so that the XML may be valid, but you may need to edit for your use case.
17-
<search:constraint name="id" xmlns:search="http://marklogic.com/appservices/search">
18-
<search:range type="xs:string" facet="true" collation="http://marklogic.com/collation/codepoint">
19-
<search:path-index xmlns:es="http://marklogic.com/entity-services">//es:instance/Order/id</search:path-index>
20-
</search:range>
21-
</search:constraint>
22-
-->
23-
<!--The name of this constraint is a duplicate in the generated XML. It is within a comment so that the XML may be valid, but you may need to edit for your use case.
2427
<search:constraint name="id" xmlns:search="http://marklogic.com/appservices/search">
2528
<search:range type="xs:string" facet="true" collation="http://marklogic.com/collation/codepoint">
2629
<search:element ns="" name="id" xmlns:es="http://marklogic.com/entity-services"/>
2730
</search:range>
2831
</search:constraint>
2932
-->
30-
<search:tuples name="Order">
31-
<search:range type="xs:string" facet="true" collation="http://marklogic.com/collation/codepoint">
32-
<search:path-index xmlns:es="http://marklogic.com/entity-services">//*:instance/Order/id</search:path-index>
33-
</search:range>
33+
<search:values name="Order">
3434
<search:range type="xs:string" facet="true" collation="http://marklogic.com/collation/codepoint">
3535
<search:element ns="" name="id" xmlns:es="http://marklogic.com/entity-services"/>
3636
</search:range>
37-
</search:tuples>
37+
</search:values>
3838
<!--Uncomment to return no results for a blank search, rather than the default of all results
3939
<search:term xmlns:search="http://marklogic.com/appservices/search">
4040
<search:empty apply="no-results"/>

‎examples/online-store/src/main/entity-config/staging-entity-options.xml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<search:options xmlns:search="http://marklogic.com/appservices/search">
2+
<search:options xml:lang="zxx" xmlns:search="http://marklogic.com/appservices/search">
33
<search:constraint name="Collection">
44
<search:collection/>
55
</search:constraint>
6+
<search:constraint name="createdByJob">
7+
<search:value>
8+
<search:field name="datahubCreatedByJob"/>
9+
</search:value>
10+
</search:constraint>
11+
<search:constraint name="createdByStep">
12+
<search:value>
13+
<search:field name="datahubCreatedByStep"/>
14+
</search:value>
15+
</search:constraint>
616
<search:constraint name="entity-type">
717
<search:value>
818
<search:element ns="http://marklogic.com/entity-services" name="title"/>
@@ -14,27 +24,17 @@
1424
</search:value>
1525
</search:constraint>
1626
<!--The name of this constraint is a duplicate in the generated XML. It is within a comment so that the XML may be valid, but you may need to edit for your use case.
17-
<search:constraint name="id" xmlns:search="http://marklogic.com/appservices/search">
18-
<search:range type="xs:string" facet="true" collation="http://marklogic.com/collation/codepoint">
19-
<search:path-index xmlns:es="http://marklogic.com/entity-services">//es:instance/Order/id</search:path-index>
20-
</search:range>
21-
</search:constraint>
22-
-->
23-
<!--The name of this constraint is a duplicate in the generated XML. It is within a comment so that the XML may be valid, but you may need to edit for your use case.
2427
<search:constraint name="id" xmlns:search="http://marklogic.com/appservices/search">
2528
<search:range type="xs:string" facet="true" collation="http://marklogic.com/collation/codepoint">
2629
<search:element ns="" name="id" xmlns:es="http://marklogic.com/entity-services"/>
2730
</search:range>
2831
</search:constraint>
2932
-->
30-
<search:tuples name="Order">
31-
<search:range type="xs:string" facet="true" collation="http://marklogic.com/collation/codepoint">
32-
<search:path-index xmlns:es="http://marklogic.com/entity-services">//*:instance/Order/id</search:path-index>
33-
</search:range>
33+
<search:values name="Order">
3434
<search:range type="xs:string" facet="true" collation="http://marklogic.com/collation/codepoint">
3535
<search:element ns="" name="id" xmlns:es="http://marklogic.com/entity-services"/>
3636
</search:range>
37-
</search:tuples>
37+
</search:values>
3838
<!--Uncomment to return no results for a blank search, rather than the default of all results
3939
<search:term xmlns:search="http://marklogic.com/appservices/search">
4040
<search:empty apply="no-results"/>

0 commit comments

Comments
 (0)