Author: deepak
Date: Thu Jun 15 08:22:44 2017
New Revision: 1798797

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

Improved: No functional change, only convert the Geo_IN.xml data geoName from 
upper case to upper camel case (OFBIZ-9406)

Modified:
    ofbiz/branches/release16.11/   (props changed)
    ofbiz/branches/release16.11/framework/common/data/GeoData_IN.xml

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 15 08:22:44 2017
@@ -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,1794008,1794132,1796047,1796262,1797733,1798682
+/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,1794008,1794132,1796047,1796262,1797733,1798668,1798682
 
/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/framework/common/data/GeoData_IN.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/common/data/GeoData_IN.xml?rev=1798797&r1=1798796&r2=1798797&view=diff
==============================================================================
--- ofbiz/branches/release16.11/framework/common/data/GeoData_IN.xml (original)
+++ ofbiz/branches/release16.11/framework/common/data/GeoData_IN.xml Thu Jun 15 
08:22:44 2017
@@ -19,41 +19,41 @@ under the License.
 -->
 
 <entity-engine-xml>
-    <Geo abbreviation="AN" geoCode="AN" geoId="IN-AN" geoName="ANDAMAN AND 
NICOBAR" geoTypeId="STATE"/>
-    <Geo abbreviation="AP" geoCode="AP" geoId="IN-AP" geoName="ANDHRA PRADESH" 
geoTypeId="STATE"/>
-    <Geo abbreviation="AR" geoCode="AR" geoId="IN-AR" geoName="ARUNACHAL 
PRADESH" geoTypeId="STATE"/>
-    <Geo abbreviation="AS" geoCode="AS" geoId="IN-AS" geoName="ASSAM" 
geoTypeId="STATE"/>
-    <Geo abbreviation="BR" geoCode="BR" geoId="IN-BR" geoName="BIHAR" 
geoTypeId="STATE"/>
-    <Geo abbreviation="CH" geoCode="CH" geoId="IN-CH" geoName="CHANDIGARH" 
geoTypeId="STATE"/>
-    <Geo abbreviation="CT" geoCode="CT" geoId="IN-CT" geoName="CHHATTISGARH" 
geoTypeId="STATE"/>
-    <Geo abbreviation="DN" geoCode="DN" geoId="IN-DN" geoName="DADRA AND NAGER 
HAVELI" geoTypeId="STATE"/>
-    <Geo abbreviation="DD" geoCode="DD" geoId="IN-DD" geoName="DAMAN AND DIU" 
geoTypeId="STATE"/>
-    <Geo abbreviation="GA" geoCode="GA" geoId="IN-GA" geoName="GOA" 
geoTypeId="STATE"/>
-    <Geo abbreviation="GJ" geoCode="GJ" geoId="IN-GJ" geoName="GUJARAT" 
geoTypeId="STATE"/>
-    <Geo abbreviation="HR" geoCode="HR" geoId="IN-HR" geoName="HARYANA" 
geoTypeId="STATE"/>
-    <Geo abbreviation="HP" geoCode="HP" geoId="IN-HP" geoName="HIMACHAL 
PRADESH" geoTypeId="STATE"/>
-    <Geo abbreviation="JK" geoCode="JK" geoId="IN-JK" geoName="JAMMU AND 
KASHMIR" geoTypeId="STATE"/>
-    <Geo abbreviation="JH" geoCode="JH" geoId="IN-JH" geoName="JHARKHAND" 
geoTypeId="STATE"/>
-    <Geo abbreviation="KA" geoCode="KA" geoId="IN-KA" geoName="KARNATAKA" 
geoTypeId="STATE"/>
-    <Geo abbreviation="KL" geoCode="KL" geoId="IN-KL" geoName="KERALA" 
geoTypeId="STATE"/>
-    <Geo abbreviation="LD" geoCode="LD" geoId="IN-LD" geoName="LAKSHADWEEP" 
geoTypeId="STATE"/>
-    <Geo abbreviation="MP" geoCode="MP" geoId="IN-MP" geoName="MADHYA PRADESH" 
geoTypeId="STATE"/>
-    <Geo abbreviation="MH" geoCode="MH" geoId="IN-MH" geoName="MAHARASHTRA" 
geoTypeId="STATE"/>
-    <Geo abbreviation="MN" geoCode="MN" geoId="IN-MN" geoName="MANIPUR" 
geoTypeId="STATE"/>
-    <Geo abbreviation="ML" geoCode="ML" geoId="IN-ML" geoName="MEGHALAYA" 
geoTypeId="STATE"/>
-    <Geo abbreviation="MZ" geoCode="MZ" geoId="IN-MZ" geoName="MIZORAM" 
geoTypeId="STATE"/>
-    <Geo abbreviation="NL" geoCode="NL" geoId="IN-NL" geoName="NAGALAND" 
geoTypeId="STATE"/>
-    <Geo abbreviation="ND" geoCode="ND" geoId="IN-ND" geoName="NEW DELHI" 
geoTypeId="STATE"/>
-    <Geo abbreviation="OR" geoCode="OR" geoId="IN-OR" geoName="ORISSA" 
geoTypeId="STATE"/>
-    <Geo abbreviation="PY" geoCode="PY" geoId="IN-PY" geoName="PONDICHERRY" 
geoTypeId="STATE"/>
-    <Geo abbreviation="PB" geoCode="PB" geoId="IN-PB" geoName="PUNJAB" 
geoTypeId="STATE"/>
-    <Geo abbreviation="RJ" geoCode="RJ" geoId="IN-RJ" geoName="RAJASTHAN" 
geoTypeId="STATE"/>
-    <Geo abbreviation="SK" geoCode="SK" geoId="IN-SK" geoName="SIKKIM" 
geoTypeId="STATE"/>
-    <Geo abbreviation="TN" geoCode="TN" geoId="IN-TN" geoName="TAMILNADU" 
geoTypeId="STATE"/>
-    <Geo abbreviation="TR" geoCode="TR" geoId="IN-TR" geoName="TRIPURA" 
geoTypeId="STATE"/>
-    <Geo abbreviation="UP" geoCode="UP" geoId="IN-UP" geoName="UTTAR PRADESH" 
geoTypeId="STATE"/>
-    <Geo abbreviation="UT" geoCode="UT" geoId="IN-UT" geoName="UTTARANCHAL" 
geoTypeId="STATE"/>
-    <Geo abbreviation="WB" geoCode="WB" geoId="IN-WB" geoName="WEST BENGAL" 
geoTypeId="STATE"/>
+    <Geo abbreviation="AN" geoCode="AN" geoId="IN-AN" geoName="Andaman And 
Nicobar" geoTypeId="STATE"/>
+    <Geo abbreviation="AP" geoCode="AP" geoId="IN-AP" geoName="Andhra Pradesh" 
geoTypeId="STATE"/>
+    <Geo abbreviation="AR" geoCode="AR" geoId="IN-AR" geoName="Arunachal 
Pradesh" geoTypeId="STATE"/>
+    <Geo abbreviation="AS" geoCode="AS" geoId="IN-AS" geoName="Assam" 
geoTypeId="STATE"/>
+    <Geo abbreviation="BR" geoCode="BR" geoId="IN-BR" geoName="Bihar" 
geoTypeId="STATE"/>
+    <Geo abbreviation="CH" geoCode="CH" geoId="IN-CH" geoName="Chandigarh" 
geoTypeId="STATE"/>
+    <Geo abbreviation="CT" geoCode="CT" geoId="IN-CT" geoName="Chhattisgarh" 
geoTypeId="STATE"/>
+    <Geo abbreviation="DN" geoCode="DN" geoId="IN-DN" geoName="Dadra And Nager 
Haveli" geoTypeId="STATE"/>
+    <Geo abbreviation="DD" geoCode="DD" geoId="IN-DD" geoName="Daman And Diu" 
geoTypeId="STATE"/>
+    <Geo abbreviation="GA" geoCode="GA" geoId="IN-GA" geoName="Goa" 
geoTypeId="STATE"/>
+    <Geo abbreviation="GJ" geoCode="GJ" geoId="IN-GJ" geoName="Gujarat" 
geoTypeId="STATE"/>
+    <Geo abbreviation="HR" geoCode="HR" geoId="IN-HR" geoName="Haryana" 
geoTypeId="STATE"/>
+    <Geo abbreviation="HP" geoCode="HP" geoId="IN-HP" geoName="Himachal 
Pradesh" geoTypeId="STATE"/>
+    <Geo abbreviation="JK" geoCode="JK" geoId="IN-JK" geoName="Jammu And 
Kashmir" geoTypeId="STATE"/>
+    <Geo abbreviation="JH" geoCode="JH" geoId="IN-JH" geoName="Jharkhand" 
geoTypeId="STATE"/>
+    <Geo abbreviation="KA" geoCode="KA" geoId="IN-KA" geoName="Karnataka" 
geoTypeId="STATE"/>
+    <Geo abbreviation="KL" geoCode="KL" geoId="IN-KL" geoName="Kerala" 
geoTypeId="STATE"/>
+    <Geo abbreviation="LD" geoCode="LD" geoId="IN-LD" geoName="Lakshadweep" 
geoTypeId="STATE"/>
+    <Geo abbreviation="MP" geoCode="MP" geoId="IN-MP" geoName="Madhya Pradesh" 
geoTypeId="STATE"/>
+    <Geo abbreviation="MH" geoCode="MH" geoId="IN-MH" geoName="Maharashtra" 
geoTypeId="STATE"/>
+    <Geo abbreviation="MN" geoCode="MN" geoId="IN-MN" geoName="Manipur" 
geoTypeId="STATE"/>
+    <Geo abbreviation="ML" geoCode="ML" geoId="IN-ML" geoName="Meghalaya" 
geoTypeId="STATE"/>
+    <Geo abbreviation="MZ" geoCode="MZ" geoId="IN-MZ" geoName="Mizoram" 
geoTypeId="STATE"/>
+    <Geo abbreviation="NL" geoCode="NL" geoId="IN-NL" geoName="Nagaland" 
geoTypeId="STATE"/>
+    <Geo abbreviation="ND" geoCode="ND" geoId="IN-ND" geoName="New Delhi" 
geoTypeId="STATE"/>
+    <Geo abbreviation="OR" geoCode="OR" geoId="IN-OR" geoName="Orissa" 
geoTypeId="STATE"/>
+    <Geo abbreviation="PY" geoCode="PY" geoId="IN-PY" geoName="Pondicherry" 
geoTypeId="STATE"/>
+    <Geo abbreviation="PB" geoCode="PB" geoId="IN-PB" geoName="Punjab" 
geoTypeId="STATE"/>
+    <Geo abbreviation="RJ" geoCode="RJ" geoId="IN-RJ" geoName="Rajasthan" 
geoTypeId="STATE"/>
+    <Geo abbreviation="SK" geoCode="SK" geoId="IN-SK" geoName="Sikkim" 
geoTypeId="STATE"/>
+    <Geo abbreviation="TN" geoCode="TN" geoId="IN-TN" geoName="Tamilnadu" 
geoTypeId="STATE"/>
+    <Geo abbreviation="TR" geoCode="TR" geoId="IN-TR" geoName="Tripura" 
geoTypeId="STATE"/>
+    <Geo abbreviation="UP" geoCode="UP" geoId="IN-UP" geoName="Uttar Pradesh" 
geoTypeId="STATE"/>
+    <Geo abbreviation="UT" geoCode="UT" geoId="IN-UT" geoName="Uttaranchal" 
geoTypeId="STATE"/>
+    <Geo abbreviation="WB" geoCode="WB" geoId="IN-WB" geoName="West Bengal" 
geoTypeId="STATE"/>
 
      <GeoAssoc geoId="IND" geoIdTo="IN-AN" geoAssocTypeId="REGIONS"/>
      <GeoAssoc geoId="IND" geoIdTo="IN-AP" geoAssocTypeId="REGIONS"/>


Reply via email to