svn commit: r1849541 - in /ofbiz/branches/release16.11: ./ applications/datamodel/entitydef/party-entitymodel.xml framework/webapp/entitydef/entitymodel.xml

[adityasharma]

Author: adityasharma
Date: Sat Dec 22 11:37:17 2018
New Revision: 1849541

URL: http://svn.apache.org/viewvc?rev=1849541&view=rev
Log:
Applied fix from trunk for revision: 1849275
===

Improved: Remove all the fk dependencies from stats entities to the business entities
(OFBIZ-10721)
stats related entities foreign key relation has been removed by Jacopo at r#1647271 and new group org.apache.ofbiz.stats introduced for stats related entity. Some remnants were still left in stats entities.
Removed relations of Party, ContactMech and Content from ServerHit entity.
Removed relations of Content from ServerHitBin entity.
Removed relations of UserLogin from Visitor entity.
Thanks Jacques Le Roux and Deepak Dixit for the review.

Modified:
    ofbiz/branches/release16.11/   (props changed)
    ofbiz/branches/release16.11/applications/datamodel/entitydef/party-entitymodel.xml
    ofbiz/branches/release16.11/framework/webapp/entitydef/entitymodel.xml

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec 22 11:37:17 2018
@@ -10,5 +10,5 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1793300,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801349-1801350,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814392,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289,
 1816291,1816297,1816369,1816373,1816461,1816635,1816795,1818101,1818269,1818273,1818402,1819122,1819136,1819144,1819811,1820823,1820949,1820966,1821012,1821036,1821613,1821965,1822310,1822377,1822383,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825233,1825262,1825444,1825450,1826374,1826592,1826671,1826805,1826938,1828255,1830936,1831234,1831608,1831831,1832577,1832662,1832756,1832944,1833211,1834181,1834191,1835235,1836144,1838032,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1845418,1845420,1845466,1845544,1845552,1846214,1846594,1846632,1847398,1848263,1848336,1848398,1848444,1848449,1849191,1849193,1849528
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1793300,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801349-1801350,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814392,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289,
 1816291,1816297,1816369,1816373,1816461,1816635,1816795,1818101,1818269,1818273,1818402,1819122,1819136,1819144,1819811,1820823,1820949,1820966,1821012,1821036,1821613,1821965,1822310,1822377,1822383,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825233,1825262,1825444,1825450,1826374,1826592,1826671,1826805,1826938,1828255,1830936,1831234,1831608,1831831,1832577,1832662,1832756,1832944,1833211,1834181,1834191,1835235,1836144,1838032,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1845418,1845420,1845466,1845544,1845552,1846214,1846594,1846632,1847398,1848263,1848336,1848398,1848444,1848449,1849191,1849193,1849275,1849528
 /ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520

Modified: ofbiz/branches/release16.11/applications/datamodel/entitydef/party-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/datamodel/entitydef/party-entitymodel.xml?rev=1849541&r1=1849540&r2=1849541&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/datamodel/entitydef/party-entitymodel.xml (original)
+++ ofbiz/branches/release16.11/applications/datamodel/entitydef/party-entitymodel.xml Sat Dec 22 11:37:17 2018
@@ -2934,24 +2934,9 @@ under the License.
         <field name="partyId" type="id"></field>
         <field name="idByIpContactMechId" type="id"></field>
         <field name="refByWebContactMechId" type="id"></field>
-        <relation type="one" fk-name="SERVER_HIT_PARTY" rel-entity-name="Party">
-            <key-map field-name="partyId"/>
-        </relation>
-        <relation type="one" fk-name="SERVER_HIT_IDBYIP" title="IdByIp" rel-entity-name="ContactMech">
-            <key-map field-name="idByIpContactMechId" rel-field-name="contactMechId"/>
-        </relation>
-        <relation type="one" fk-name="SERVER_HIT_REFWEB" title="RefByWeb" rel-entity-name="ContactMech">
-            <key-map field-name="refByWebContactMechId" rel-field-name="contactMechId"/>
-        </relation>
-        <relation type="one" fk-name="SERVER_HIT_CNT" rel-entity-name="Content">
-            <key-map field-name="internalContentId" rel-field-name="contentId"/>
-        </relation>
     </extend-entity>
     <extend-entity entity-name="ServerHitBin">
         <field name="internalContentId" type="id"></field>
-        <relation type="one" fk-name="SERVER_HBIN_CNT" rel-entity-name="Content">
-            <key-map field-name="internalContentId" rel-field-name="contentId"/>
-        </relation>
     </extend-entity>
     <extend-entity entity-name="Visit">
         <field name="contactMechId" type="id"></field>

Modified: ofbiz/branches/release16.11/framework/webapp/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/webapp/entitydef/entitymodel.xml?rev=1849541&r1=1849540&r2=1849541&view=diff
==============================================================================
--- ofbiz/branches/release16.11/framework/webapp/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/release16.11/framework/webapp/entitydef/entitymodel.xml Sat Dec 22 11:37:17 2018
@@ -193,9 +193,6 @@ under the License.
         <field name="visitorId" type="id-ne"></field>
         <field name="userLoginId" type="id-vlong"></field>
         <prim-key field="visitorId"/>
-        <relation type="one" fk-name="VISITOR_USRLGN" rel-entity-name="UserLogin">
-            <key-map field-name="userLoginId"/>
-        </relation>
     </entity>
 
   <!-- ========================================================= -->