svn commit: r951476 - in /ofbiz/branches/release10.04: ./ framework/common/data/GeoData_DE.xml

Author: jleroux
Date: Fri Jun  4 16:24:34 2010
New Revision: 951476

URL: http://svn.apache.org/viewvc?rev=951476&view=rev
Log:
"Applied fix from trunk for revision: 951062"
------------------------------------------------------------------------
r951062 | doogie | 2010-06-03 18:42:01 +0200 (jeu. 03 juin 2010) | 4 lignes

Associate to the correct geo; DE=Delaware, in the United States.  A full
clean detected this error, as GeoData_US.xml wasn't imported yet, so I
got an exception when DE didn't exist.  The patch in OFBIZ-3800 was
*not* correct, and was not verified.
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/framework/common/data/GeoData_DE.xml

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun  4 16:24:34 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951098,951251,951367,951381
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381

Modified: ofbiz/branches/release10.04/framework/common/data/GeoData_DE.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/common/data/GeoData_DE.xml?rev=951476&r1=951475&r2=951476&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/common/data/GeoData_DE.xml (original)
+++ ofbiz/branches/release10.04/framework/common/data/GeoData_DE.xml Fri Jun  4 16:24:34 2010
@@ -36,20 +36,20 @@ under the License.
     <Geo abbreviation="SA" geoCode="SA" geoId="DE-SA" geoName="Sachsen-Anhalt" geoTypeId="STATE"/>
     <Geo abbreviation="TH" geoCode="TH" geoId="DE-TH" geoName="Thüringen" geoTypeId="STATE"/>
 
-    <GeoAssoc geoId="DE" geoIdTo="DE-BW" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="DE" geoIdTo="DE-BY" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="DE" geoIdTo="DE-BE" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="DE" geoIdTo="DE-BR" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="DE" geoIdTo="DE-HB" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="DE" geoIdTo="DE-HH" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="DE" geoIdTo="DE-HE" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="DE" geoIdTo="DE-MV" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="DE" geoIdTo="DE-NI" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="DE" geoIdTo="DE-NW" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="DE" geoIdTo="DE-RP" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="DE" geoIdTo="DE-SL" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="DE" geoIdTo="DE-SH" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="DE" geoIdTo="DE-SN" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="DE" geoIdTo="DE-SA" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="DE" geoIdTo="DE-TH" geoAssocTypeId="REGIONS"/>
-</entity-engine-xml>
\ No newline at end of file
+    <GeoAssoc geoId="DEU" geoIdTo="DE-BW" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="DEU" geoIdTo="DE-BY" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="DEU" geoIdTo="DE-BE" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="DEU" geoIdTo="DE-BR" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="DEU" geoIdTo="DE-HB" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="DEU" geoIdTo="DE-HH" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="DEU" geoIdTo="DE-HE" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="DEU" geoIdTo="DE-MV" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="DEU" geoIdTo="DE-NI" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="DEU" geoIdTo="DE-NW" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="DEU" geoIdTo="DE-RP" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="DEU" geoIdTo="DE-SL" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="DEU" geoIdTo="DE-SH" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="DEU" geoIdTo="DE-SN" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="DEU" geoIdTo="DE-SA" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="DEU" geoIdTo="DE-TH" geoAssocTypeId="REGIONS"/>
+</entity-engine-xml>