Author: deepak
Date: Sat May 27 11:32:18 2017
New Revision: 1796380
URL: http://svn.apache.org/viewvc?rev=1796380&view=rev
Log:
Improved: Replace fields with "id-ne", "id-long-ne" and "id-vlong-ne"
with "id", "id-long" and "id-vlong" respectively which are primary keys for
plugin components.
(OFBIZ-9351)
Thanks Aditya Sharma for your contribution.
Modified:
ofbiz/ofbiz-plugins/trunk/bi/entitydef/entitymodel.xml
ofbiz/ofbiz-plugins/trunk/ebay/entitydef/entitymodel.xml
ofbiz/ofbiz-plugins/trunk/ebaystore/entitydef/entitymodel.xml
ofbiz/ofbiz-plugins/trunk/example/entitydef/entitymodel.xml
ofbiz/ofbiz-plugins/trunk/passport/entitydef/entitymodel.xml
ofbiz/ofbiz-plugins/trunk/pricat/entitydef/entitymodel.xml
ofbiz/ofbiz-plugins/trunk/scrum/entitydef/entitymodel.xml
ofbiz/ofbiz-plugins/trunk/webpos/entitydef/entitymodel.xml
Modified: ofbiz/ofbiz-plugins/trunk/bi/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/bi/entitydef/entitymodel.xml?rev=1796380&r1=1796379&r2=1796380&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/bi/entitydef/entitymodel.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/bi/entitydef/entitymodel.xml Sat May 27 11:32:18
2017
@@ -31,7 +31,7 @@ under the License.
<!-- ========================================================= -->
<entity entity-name="DateDimension"
package-name="org.apache.ofbiz.bi.dimension" title="Date Dimension">
<description>Date (days) dimension. The natural key is
[dateValue]</description>
- <field name="dimensionId" type="id-ne">
+ <field name="dimensionId" type="id">
<description>Unique identifier of the Date dimension
record</description>
</field>
<field name="dateValue" type="date">
@@ -78,7 +78,7 @@ under the License.
<entity entity-name="CurrencyDimension"
package-name="org.apache.ofbiz.bi.dimension" title="Currency Dimension">
<description>Currency dimension. The natural key is
[currencyId]</description>
- <field name="dimensionId" type="id-ne">
+ <field name="dimensionId" type="id">
<description>Unique identifier of the Currency dimension
record</description>
</field>
<field name="currencyId" type="id-ne">
@@ -92,7 +92,7 @@ under the License.
<entity entity-name="ProductDimension"
package-name="org.apache.ofbiz.bi.dimension.product" title="Product Dimension">
<description>Product dimension. The natural key is
[productId]</description>
- <field name="dimensionId" type="id-ne">
+ <field name="dimensionId" type="id">
<description>Unique identifier of the Product dimension
record</description>
</field>
<field name="productId" type="id-ne">
@@ -111,8 +111,8 @@ under the License.
<!-- ========================================================= -->
<entity entity-name="SalesInvoiceItemFact"
package-name="org.apache.ofbiz.bi.fact.accounting" title="Sales Invoice Item
Fact">
<description>A transaction fact entity with invoice item
grain.</description>
- <field name="invoiceId" type="id-ne"></field> <!-- degenerate
dimension -->
- <field name="invoiceItemSeqId" type="id-ne"></field> <!-- degenerate
dimension -->
+ <field name="invoiceId" type="id"></field> <!-- degenerate dimension
-->
+ <field name="invoiceItemSeqId" type="id"></field> <!-- degenerate
dimension -->
<field name="orderId" type="id-ne"></field> <!-- degenerate dimension
-->
<field name="invoiceDateDimId" type="id-ne"></field>
<field name="productDimId" type="id-ne"></field>
@@ -195,8 +195,8 @@ under the License.
<entity entity-name="SalesOrderItemFact"
package-name="org.apache.ofbiz.bi.fact.order" title="Sales Order Item Fact">
<description>A transaction fact entity with order item
grain.</description>
- <field name="orderId" type="id-ne"></field> <!-- degenerate dimension
-->
- <field name="orderItemSeqId" type="id-ne"></field> <!-- degenerate
dimension -->
+ <field name="orderId" type="id"></field> <!-- degenerate dimension -->
+ <field name="orderItemSeqId" type="id"></field> <!-- degenerate
dimension -->
<field name="orderDateDimId" type="id-ne"></field>
<field name="productDimId" type="id-ne"></field>
<field name="origCurrencyDimId" type="id-ne"></field>
@@ -280,7 +280,7 @@ under the License.
<entity entity-name="InventoryItemFact"
package-name="org.apache.ofbiz.bi.fact.product" title="Inventory Item Fact">
<description>A transaction fact entity with inventory
item.</description>
- <field name="inventoryItemId" type="id-ne"></field>
+ <field name="inventoryItemId" type="id"></field>
<field name="facilityId" type="id-ne"></field>
<field name="productDimId" type="id-ne"></field>
<field name="origCurrencyDimId" type="id-ne"></field>
Modified: ofbiz/ofbiz-plugins/trunk/ebay/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ebay/entitydef/entitymodel.xml?rev=1796380&r1=1796379&r2=1796380&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ebay/entitydef/entitymodel.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/ebay/entitydef/entitymodel.xml Sat May 27
11:32:18 2017
@@ -41,7 +41,7 @@ under the License.
<entity entity-name="EbayConfig"
package-name="org.apache.ofbiz.ebay.config"
title="eBay Configuration">
- <field name="productStoreId" type="id-ne"></field>
+ <field name="productStoreId" type="id"></field>
<field name="devId" type="value"></field>
<field name="appId" type="value"></field>
<field name="certId" type="value"></field>
@@ -63,8 +63,8 @@ under the License.
<entity entity-name="EbayShippingMethod"
package-name="org.apache.ofbiz.ebay.shipping"
title="Ebay Shipping Method Config">
- <field name="shipmentMethodName" type="id-long-ne"></field>
- <field name="productStoreId" type="id-ne"></field>
+ <field name="shipmentMethodName" type="id-long"></field>
+ <field name="productStoreId" type="id"></field>
<field name="amount" type="currency-amount"></field>
<field name="additionalAmount" type="currency-amount"></field>
<field name="additionalPercent" type="fixed-point"></field>
Modified: ofbiz/ofbiz-plugins/trunk/ebaystore/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ebaystore/entitydef/entitymodel.xml?rev=1796380&r1=1796379&r2=1796380&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ebaystore/entitydef/entitymodel.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/ebaystore/entitydef/entitymodel.xml Sat May 27
11:32:18 2017
@@ -34,9 +34,9 @@ under the License.
<entity entity-name="EbayProductStoreInventory"
package-name="org.apache.ofbiz.ebay.store"
title="Ebay store product inventory and status of listing">
- <field name="productStoreId" type="id-ne"></field>
- <field name="facilityId" type="id-ne"></field>
- <field name="productId" type="id-ne"></field>
+ <field name="productStoreId" type="id"></field>
+ <field name="facilityId" type="id"></field>
+ <field name="productId" type="id"></field>
<field name="folderId" type="id-ne"></field>
<field name="ebayProductId" type="numeric"></field>
<field name="quantityReserved" type="fixed-point"></field>
@@ -57,8 +57,8 @@ under the License.
</entity>
<entity entity-name="EbayProductStorePref"
package-name="org.apache.ofbiz.ebay.store"
title="Ebay store and Preference">
- <field name="productStoreId" type="id-ne"/>
- <field name="autoPrefEnumId" type="id-ne"/>
+ <field name="productStoreId" type="id"/>
+ <field name="autoPrefEnumId" type="id"/>
<field name="autoPrefJobId" type="id-ne"/>
<field name="enabled" type="indicator"/>
<field name="condition1" type="value"/>
@@ -79,7 +79,7 @@ under the License.
</entity>
<entity entity-name="EbayProductListing"
package-name="org.apache.ofbiz.ebay.store"
title="eBay Product Listing">
- <field name="productListingId" type="id-ne"/>
+ <field name="productListingId" type="id"/>
<field name="itemId" type="id-long"/>
<field name="productStoreId" type="id-ne"/>
<field name="productId" type="id-ne"/>
@@ -102,8 +102,8 @@ under the License.
</entity>
<entity entity-name="EbayProductListingAttribute"
package-name="org.apache.ofbiz.ebay.store"
title="eBay Product Listing">
- <field name="productListingId" type="id-ne"/>
- <field name="attrName" type="id-long-ne"/>
+ <field name="productListingId" type="id"/>
+ <field name="attrName" type="id-long"/>
<field name="attrValue" type="value"/>
<prim-key field="productListingId"/>
<prim-key field="attrName"/>
@@ -113,7 +113,7 @@ under the License.
</entity>
<entity entity-name="EBayLogMessagesInfo"
package-name="org.apache.ofbiz.ebay.store"
title="eBay Log Messages Info">
- <field name="productStoreId" type="id-ne"/>
+ <field name="productStoreId" type="id"/>
<field name="logAck" type="name"/>
<field name="functionName" type="name"/>
<field name="logMessage" type="very-long"/>
@@ -125,10 +125,10 @@ under the License.
</relation>
</entity>
<entity entity-name="EbayProductStorePrefCond"
package-name="org.apache.ofbiz.ebay.store">
- <field name="prefCondId" type="id-ne"/>
+ <field name="prefCondId" type="id"/>
<field name="acceptanceCondition" type="long-varchar"></field>
<field name="description" type="long-varchar"></field>
- <field name="parentPrefCondId" type="id-ne"></field>
+ <field name="parentPrefCondId" type="id"></field>
<prim-key field="prefCondId"/>
</entity>
<entity entity-name="EbayUserBestOffer"
package-name="org.apache.ofbiz.ebay.store"
Modified: ofbiz/ofbiz-plugins/trunk/example/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/example/entitydef/entitymodel.xml?rev=1796380&r1=1796379&r2=1796380&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/example/entitydef/entitymodel.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/example/entitydef/entitymodel.xml Sat May 27
11:32:18 2017
@@ -40,7 +40,7 @@ under the License.
<!-- ========================================================= -->
<entity entity-name="Example"
package-name="org.apache.ofbiz.example.example" title="Example Entity">
- <field name="exampleId" type="id-ne"><description>primary sequenced
ID</description></field>
+ <field name="exampleId" type="id"><description>primary sequenced
ID</description></field>
<field name="exampleTypeId" type="id-ne"></field>
<field name="statusId" type="id-ne"></field>
<field name="exampleName" type="name"></field>
@@ -60,8 +60,8 @@ under the License.
</relation>
</entity>
<entity entity-name="ExampleItem"
package-name="org.apache.ofbiz.example.example" title="Example Item Entity">
- <field name="exampleId" type="id-ne"></field>
- <field name="exampleItemSeqId" type="id-ne"><description>secondary
sequenced ID</description></field>
+ <field name="exampleId" type="id"></field>
+ <field name="exampleItemSeqId" type="id"><description>secondary
sequenced ID</description></field>
<field name="description" type="description"></field>
<field name="amount" type="floating-point"></field>
<field name="amountUomId" type="id"></field>
@@ -75,7 +75,7 @@ under the License.
</relation>
</entity>
<entity entity-name="ExampleStatus"
package-name="org.apache.ofbiz.example.example" title="Example Status Entity">
- <field name="exampleId" type="id-ne"></field>
+ <field name="exampleId" type="id"></field>
<field name="statusDate" type="date-time"></field>
<field name="statusEndDate" type="date-time"></field>
<field name="changeByUserLoginId" type="id-vlong"></field>
@@ -95,7 +95,7 @@ under the License.
<entity entity-name="ExampleType"
package-name="org.apache.ofbiz.example.example"
title="Example Type Entity">
- <field name="exampleTypeId" type="id-ne"></field>
+ <field name="exampleTypeId" type="id"></field>
<field name="parentTypeId" type="id"></field>
<field name="description" type="description"></field>
<prim-key field="exampleTypeId"/>
@@ -111,7 +111,7 @@ under the License.
<entity entity-name="ExampleFeature"
package-name="org.apache.ofbiz.example.feature"
title="Example Feature Entity">
- <field name="exampleFeatureId" type="id-ne"><description>primary
sequenced ID</description></field>
+ <field name="exampleFeatureId" type="id"><description>primary
sequenced ID</description></field>
<field name="featureSourceEnumId" type="id-ne"></field>
<field name="description" type="description"></field>
<prim-key field="exampleFeatureId"/>
@@ -122,8 +122,8 @@ under the License.
<entity entity-name="ExampleFeatureAppl"
package-name="org.apache.ofbiz.example.feature"
title="Example Feature Application Entity">
- <field name="exampleId" type="id-ne"></field>
- <field name="exampleFeatureId" type="id-ne"></field>
+ <field name="exampleId" type="id"></field>
+ <field name="exampleFeatureId" type="id"></field>
<field name="fromDate" type="date-time"></field>
<field name="thruDate" type="date-time"></field>
<field name="exampleFeatureApplTypeId" type="id-ne"></field>
@@ -144,7 +144,7 @@ under the License.
<entity entity-name="ExampleFeatureApplType"
package-name="org.apache.ofbiz.example.feature"
title="Example Feature Application Type Entity">
- <field name="exampleFeatureApplTypeId" type="id-ne"></field>
+ <field name="exampleFeatureApplTypeId" type="id"></field>
<field name="parentTypeId" type="id"></field>
<field name="description" type="description"></field>
<prim-key field="exampleFeatureApplTypeId"/>
Modified: ofbiz/ofbiz-plugins/trunk/passport/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/passport/entitydef/entitymodel.xml?rev=1796380&r1=1796379&r2=1796380&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/passport/entitydef/entitymodel.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/passport/entitydef/entitymodel.xml Sat May 27
11:32:18 2017
@@ -27,9 +27,9 @@ under the License.
package-name="org.apache.ofbiz.passport"
title="Third party logins for a specific product store"
default-resource-name="PassportEntityLabels">
- <field name="productStoreId" type="id-ne"></field>
- <field name="loginMethTypeId" type="id-ne"></field><!-- i.e. OAuth2 -->
- <field name="loginProviderId" type="id-ne"></field><!-- i.e. GitHub -->
+ <field name="productStoreId" type="id"></field>
+ <field name="loginMethTypeId" type="id"></field><!-- i.e. OAuth2 -->
+ <field name="loginProviderId" type="id"></field><!-- i.e. GitHub -->
<field name="fromDate" type="date-time"></field>
<field name="thruDate" type="date-time"></field>
<field name="sequenceNum" type="numeric"></field>
@@ -51,7 +51,7 @@ under the License.
package-name="org.apache.ofbiz.passport"
title="GitHub OAuth Login Config"
default-resource-name="PassportEntityLabels">
- <field name="productStoreId" type="id-ne"></field>
+ <field name="productStoreId" type="id"></field>
<field name="clientId" type="short-varchar"></field>
<field name="clientSecret" type="short-varchar"></field>
<field name="returnUrl" type="value"></field>
@@ -70,7 +70,7 @@ under the License.
package-name="org.apache.ofbiz.passport"
title="Store GitHub access token for user"
default-resource-name="PassportEntityLabels">
- <field name="gitHubUserId" type="id-vlong-ne"></field>
+ <field name="gitHubUserId" type="id-vlong"></field>
<field name="productStoreId" type="id-ne"></field>
<field name="envPrefix" type="short-varchar"></field>
<field name="tokenType" type="short-varchar"></field>
@@ -86,7 +86,7 @@ under the License.
package-name="org.apache.ofbiz.passport"
title="LinkedIn OAuth Login Config"
default-resource-name="PassportEntityLabels">
- <field name="productStoreId" type="id-ne"></field>
+ <field name="productStoreId" type="id"></field>
<field name="apiKey" type="short-varchar"></field>
<field name="secretKey" type="short-varchar"></field>
<field name="liveReturnUrl" type="value"></field>
@@ -106,7 +106,7 @@ under the License.
package-name="org.apache.ofbiz.passport"
title="Store LinkedIn access token for user"
default-resource-name="PassportEntityLabels">
- <field name="linkedInUserId" type="id-vlong-ne"></field>
+ <field name="linkedInUserId" type="id-vlong"></field>
<field name="productStoreId" type="id-ne"></field>
<field name="envPrefix" type="short-varchar"></field>
<field name="accessToken" type="value"></field>
Modified: ofbiz/ofbiz-plugins/trunk/pricat/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/pricat/entitydef/entitymodel.xml?rev=1796380&r1=1796379&r2=1796380&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/pricat/entitydef/entitymodel.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/pricat/entitydef/entitymodel.xml Sat May 27
11:32:18 2017
@@ -28,7 +28,7 @@ under the License.
<field name="fileName" type="value"></field>
<field name="fromDate" type="date-time"></field>
<field name="thruDate" type="date-time"></field>
- <field name="thruReasonId" type="id-ne"></field>
+ <field name="thruReasonId" type="id"></field>
<field name="statusId" type="id-ne"></field>
<field name="threadName" type="name"></field>
<field name="logFileName" type="value"></field>
Modified: ofbiz/ofbiz-plugins/trunk/scrum/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/scrum/entitydef/entitymodel.xml?rev=1796380&r1=1796379&r2=1796380&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/scrum/entitydef/entitymodel.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/scrum/entitydef/entitymodel.xml Sat May 27
11:32:18 2017
@@ -83,7 +83,7 @@ under the License.
<extend-entity entity-name="CustRequest">
<field name="custEstimatedMilliSeconds" type="floating-point"/>
<field name="custSequenceNum" type="numeric"/>
- <field name="parentCustRequestId" type="id-ne"/>
+ <field name="parentCustRequestId" type="id"/>
<field name="billed" type="indicator"/>
<relation type="one" fk-name="CUST_REQ_PARENT" title="Parent"
rel-entity-name="CustRequest">
<key-map field-name="parentCustRequestId"
rel-field-name="custRequestId"/>
Modified: ofbiz/ofbiz-plugins/trunk/webpos/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/webpos/entitydef/entitymodel.xml?rev=1796380&r1=1796379&r2=1796380&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/webpos/entitydef/entitymodel.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/webpos/entitydef/entitymodel.xml Sat May 27
11:32:18 2017
@@ -40,7 +40,7 @@ under the License.
<entity entity-name="PosTerminal"
package-name="org.apache.ofbiz.plugins.pos"
title="Pos Terminal">
- <field name="posTerminalId" type="id-ne"></field>
+ <field name="posTerminalId" type="id"></field>
<field name="facilityId" type="id"></field>
<field name="pushEntitySyncId" type="id"></field>
<field name="terminalName" type="name"></field>
@@ -49,7 +49,7 @@ under the License.
<entity entity-name="PosTerminalLog"
package-name="org.apache.ofbiz.plugins.pos"
title="Pos Terminal Log">
- <field name="posTerminalLogId" type="id-ne"></field>
+ <field name="posTerminalLogId" type="id"></field>
<field name="posTerminalId" type="id-ne"></field>
<field name="transactionId" type="id"></field>
<field name="itemCount" type="numeric"></field>
@@ -76,7 +76,7 @@ under the License.
<entity entity-name="PosTerminalState"
package-name="org.apache.ofbiz.plugins.pos"
title="Pos Terminal State">
- <field name="posTerminalId" type="id-ne"></field>
+ <field name="posTerminalId" type="id"></field>
<field name="openedDate" type="date-time"></field>
<field name="closedDate" type="date-time"></field>
<field name="startingTxId" type="id-long"></field>
@@ -98,7 +98,7 @@ under the License.
<entity entity-name="PosTerminalInternTx"
package-name="org.apache.ofbiz.plugins.pos"
title="Pos Terminal Internal Transaction">
- <field name="posTerminalLogId" type="id-ne"></field>
+ <field name="posTerminalLogId" type="id"></field>
<field name="paidAmount" type="currency-amount"></field>
<field name="reasonComment" type="comment"/>
<field name="reasonEnumId" type="id"/>
