svn commit: r990340 - in /ofbiz/branches/release10.04: ./ applications/marketing/config/ framework/common/config/ framework/common/widget/ framework/webtools/webapp/webtools/WEB-INF/actions/entity/

Author: jleroux
Date: Sat Aug 28 11:02:39 2010
New Revision: 990340

URL: http://svn.apache.org/viewvc?rev=990340&view=rev
Log:
"Applied fix from trunk for revision: 990339"
------------------------------------------------------------------------
r990339 | jleroux | 2010-08-28 12:53:03 +0200 (sam. 28 ao–t 2010) | 4 lignes

A patch from Sascha Rodekamp "Xml Ds Dump Iterator Fix - Webtools" (https://issues.apache.org/jira/browse/OFBIZ-3906) - OFBIZ-3906

Issue with the Xml Export: it seems that there is an issue with the each() loop in Groovy, during the export OFBiz throws a lot of warnings which regards to an wrong used iterator.
So i changed the each() loop into a normal iterator which solves the issue.
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/applications/marketing/config/MarketingUiLabels.xml
    ofbiz/branches/release10.04/framework/common/config/CommonUiLabels.xml
    ofbiz/branches/release10.04/framework/common/widget/LookupScreens.xml
    ofbiz/branches/release10.04/framework/webtools/webapp/webtools/WEB-INF/actions/entity/XmlDsDump.groovy

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 28 11:02:39 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,940851,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,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985473,985718,985856,985902,987841,989166,989389,990127
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,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,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985473,985718,985856,985902,987841,989166,990127,990339

Modified: ofbiz/branches/release10.04/applications/marketing/config/MarketingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/marketing/config/MarketingUiLabels.xml?rev=990340&r1=990339&r2=990340&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/marketing/config/MarketingUiLabels.xml (original)
+++ ofbiz/branches/release10.04/applications/marketing/config/MarketingUiLabels.xml Sat Aug 28 11:02:39 2010
@@ -1872,6 +1872,15 @@
         <value xml:lang="th">ค้นหาข้อมูลรายการติดต่อ</value>
         <value xml:lang="zh">查找联系列表</value>
     </property>
+    <property key="PageTitleLookupGeo">
+        <value xml:lang="en">Lookup Geo</value>
+        <value xml:lang="fr">Consulter la zone géographique</value>
+        <value xml:lang="it">Ricerca Geografia</value>
+        <value xml:lang="pt_BR">Buscar localização</value>
+        <value xml:lang="ro">Cauta Geografia</value>
+        <value xml:lang="th">ค้นหาข้อมูลโครงสร้าง</value>
+        <value xml:lang="zh">查找地理</value>
+    </property>
     <property key="PageTitleLookupSalesForecast">
         <value xml:lang="de">Verkaufsprognosen anschauen</value>
         <value xml:lang="en">Lookup Sales Forecast</value>

Modified: ofbiz/branches/release10.04/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/common/config/CommonUiLabels.xml?rev=990340&r1=990339&r2=990340&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/branches/release10.04/framework/common/config/CommonUiLabels.xml Sat Aug 28 11:02:39 2010
@@ -9348,15 +9348,6 @@
         <value xml:lang="th">เข้าสู่ระบบ</value>
         <value xml:lang="zh">登录</value>
     </property>
-    <property key="PageTitleLookupGeo">
-        <value xml:lang="en">Lookup Geo</value>
-        <value xml:lang="fr">Consulter la zone géographique</value>
-        <value xml:lang="it">Ricerca Geografia</value>
-        <value xml:lang="pt_BR">Buscar localização</value>
-        <value xml:lang="ro">Cauta Geografia</value>
-        <value xml:lang="th">ค้นหาข้อมูลโครงสร้าง</value>
-        <value xml:lang="zh">查找地理</value>
-    </property>    
     <property key="PageTitleMain">
         <value xml:lang="cs">úvodní strana</value>
         <value xml:lang="de">Startseite</value>

Modified: ofbiz/branches/release10.04/framework/common/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/common/widget/LookupScreens.xml?rev=990340&r1=990339&r2=990340&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/common/widget/LookupScreens.xml (original)
+++ ofbiz/branches/release10.04/framework/common/widget/LookupScreens.xml Sat Aug 28 11:02:39 2010
@@ -25,6 +25,7 @@ under the License.
     <screen name="LookupGeo">
         <section>
             <actions>
+                <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="title" value="${uiLabelMap.PageTitleLookupGeo}"/>
                 <set field="queryString" from-field="result.queryString"/>
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>

Modified: ofbiz/branches/release10.04/framework/webtools/webapp/webtools/WEB-INF/actions/entity/XmlDsDump.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/webtools/webapp/webtools/WEB-INF/actions/entity/XmlDsDump.groovy?rev=990340&r1=990339&r2=990340&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/webtools/webapp/webtools/WEB-INF/actions/entity/XmlDsDump.groovy (original)
+++ ofbiz/branches/release10.04/framework/webtools/webapp/webtools/WEB-INF/actions/entity/XmlDsDump.groovy Sat Aug 28 11:02:39 2010
@@ -212,7 +212,8 @@ if (tobrowser) {
                 }
 
                 curNumberWritten = 0;
-                values.each { value ->
+                valuesIter = values.iterator();
+                while ((value = valuesIter.next()) != null) {
                     value.writeXmlText(writer, "");
                     numberWritten++;
                     curNumberWritten++;
@@ -268,7 +269,8 @@ if (tobrowser) {
                     isFirst = true;
                     writer = null;
                     fileSplitNumber = 1;
-                    values.each { value ->
+                    valuesIter = values.iterator();
+                    while ((value = valuesIter.next()) != null) {
                         //Don't bother writing the file if there's nothing
                         //to put into it
                         if (isFirst) {