You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ofbiz.apache.org by Scott Gray <sc...@hotwaxmedia.com> on 2011/10/14 01:41:20 UTC
Re: svn commit: r1182860 - in /ofbiz/branches/release11.04: ./ applications/order/script/org/ofbiz/order/customer/ applications/party/webapp/partymgr/WEB-INF/actions/party/ applications/product/script/org/ofbiz/product/test/ framework/common/src/org/ofbiz/...
Jacques, I'm not sure if it's this commit or the last one but the build now fails on the JsLanguageFileMappingCreator.java class.
Please be careful with the release branches.
Thanks
Scott
On 14/10/2011, at 2:57 AM, jleroux@apache.org wrote:
> Author: jleroux
> Date: Thu Oct 13 13:57:35 2011
> New Revision: 1182860
>
> URL: http://svn.apache.org/viewvc?rev=1182860&view=rev
> Log:
> "Applied fix from trunk for revision: 1182858 "
> ------------------------------------------------------------------------
> r1182858 | jleroux | 2011-10-13 15:51:37 +0200 (jeu., 13 oct. 2011) | 2 lines
>
> JQuery team does not care about plugins consistency, so we have to be careful. For instance, for more fun: in validate plugin we have also ptpt and ptbr...
> Just found by chance while looking for consistency in JsLanguageFileMappingCreator class after refactoring
> ------------------------------------------------------------------------
>
>
> Modified:
> ofbiz/branches/release11.04/ (props changed)
> ofbiz/branches/release11.04/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed)
> ofbiz/branches/release11.04/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed)
> ofbiz/branches/release11.04/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed)
> ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java
> ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java
> ofbiz/branches/release11.04/framework/common/widget/HelpScreens.xml (props changed)
> ofbiz/branches/release11.04/framework/security/data/PasswordSecurityData.xml (props changed)
> ofbiz/branches/release11.04/specialpurpose/ebaystore/lib/ (props changed)
> ofbiz/branches/release11.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed)
> ofbiz/branches/release11.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed)
> ofbiz/branches/release11.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed)
>
> Propchange: ofbiz/branches/release11.04/
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Thu Oct 13 13:57:35 2011
> @@ -2,4 +2,4 @@
> /ofbiz/branches/dojo1.4:951708-952957
> /ofbiz/branches/jquery:952958-1044489
> /ofbiz/branches/multitenant20100310:921280-927264
> -/ofbiz/trunk:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1133353,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1167606,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731
> +/ofbiz/trunk:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1133353,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1167606,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731,1182858
>
> Propchange: ofbiz/branches/release11.04/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Thu Oct 13 13:57:35 2011
> @@ -2,4 +2,4 @@
> /ofbiz/branches/dojo1.4/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-952957
> /ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:952958-1044489
> /ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264
> -/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731
> +/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731,1182858
>
> Propchange: ofbiz/branches/release11.04/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Thu Oct 13 13:57:35 2011
> @@ -2,4 +2,4 @@
> /ofbiz/branches/dojo1.4/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-952957
> /ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:952958-1044489
> /ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:921280-927264
> -/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731
> +/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731,1182858
>
> Propchange: ofbiz/branches/release11.04/applications/product/script/org/ofbiz/product/test/InventoryTests.xml
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Thu Oct 13 13:57:35 2011
> @@ -2,4 +2,4 @@
> /ofbiz/branches/dojo1.4/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-952957
> /ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:952958-1044489
> /ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:921280-927264
> -/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731
> +/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731,1182858
>
> Modified: ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java
> URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java?rev=1182860&r1=1182859&r2=1182860&view=diff
> ==============================================================================
> --- ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java (original)
> +++ ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java Thu Oct 13 13:57:35 2011
> @@ -50,8 +50,10 @@ public class JsLanguageFileMappingCreato
> for (Locale locale : localeList) {
> String displayCountry = locale.toString();
> String modifiedDisplayCountry = null;
> + String modifiedDisplayCountryForValidation = null;
> if (displayCountry.indexOf('_') != -1) {
> modifiedDisplayCountry = displayCountry.replace("_", "-");
> + modifiedDisplayCountryForValidation = displayCountry.replace("_", "").toLowerCase(); // fun: in validate plugin we have also ptpt and ptbr for instance...
> } else {
> modifiedDisplayCountry = displayCountry;
> }
> @@ -88,11 +90,19 @@ public class JsLanguageFileMappingCreato
> */
> fileName = componentRoot + validateRelPath + validateLocalePrefix + strippedLocale + jsFilePostFix;
> file = FileUtil.getFile(fileName);
> +
> if (file.exists()) {
> fileUrl = validateRelPath + validateLocalePrefix + strippedLocale + jsFilePostFix;
> } else {
> - // use default language en
> - fileUrl = validateRelPath + validateLocalePrefix + defaultLocaleJquery + jsFilePostFix;
> + // Try to guess a language (fun: in validate plugin we have also ptpt and ptbr for instance....)
> + fileName = componentRoot + validateRelPath + validateLocalePrefix + modifiedDisplayCountryForValidation + jsFilePostFix;
> + file = FileUtil.getFile(fileName);
> + if (file.exists()) {
> + fileUrl = validateRelPath + validateLocalePrefix + modifiedDisplayCountryForValidation + jsFilePostFix;
> + } else {
> + // use default language en
> + fileUrl = validateRelPath + validateLocalePrefix + defaultLocaleJquery + jsFilePostFix;
> + }
> }
> validationLocaleFile.put(displayCountry, fileUrl);
>
>
> Modified: ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java
> URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java?rev=1182860&r1=1182859&r2=1182860&view=diff
> ==============================================================================
> --- ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java (original)
> +++ ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java Thu Oct 13 13:57:35 2011
> @@ -28,7 +28,7 @@ import javolution.util.FastMap;
> public final class JsLanguageFilesMapping {
>
> // DO NOT EDIT THIS FILE! THIS IS AUTO GENERATED AND WILL GET WRITTEN OVER PERIODICALLY WHEN THE DATA CHANGE
> - // Rather use the createJsLanguageFileMapping to create or update it. You will still need to compile thereafter
> + // Rather use the createJsLanguageFileMapping service to create or update it. You will still need to compile thereafter
>
> public static class datejs {
>
> @@ -477,8 +477,8 @@ public final class JsLanguageFilesMappin
> localeFiles.put("pl", "/images/jquery/plugins/validate/localization/messages_pl.js");
> localeFiles.put("pl_PL", "/images/jquery/plugins/validate/localization/messages_pl.js");
> localeFiles.put("pt", "/images/jquery/plugins/validate/localization/messages_en.js");
> - localeFiles.put("pt_BR", "/images/jquery/plugins/validate/localization/messages_en.js");
> - localeFiles.put("pt_PT", "/images/jquery/plugins/validate/localization/messages_en.js");
> + localeFiles.put("pt_BR", "/images/jquery/plugins/validate/localization/messages_ptbr.js");
> + localeFiles.put("pt_PT", "/images/jquery/plugins/validate/localization/messages_ptpt.js");
> localeFiles.put("ro", "/images/jquery/plugins/validate/localization/messages_ro.js");
> localeFiles.put("ro_RO", "/images/jquery/plugins/validate/localization/messages_ro.js");
> localeFiles.put("ru", "/images/jquery/plugins/validate/localization/messages_ru.js");
>
> Propchange: ofbiz/branches/release11.04/framework/common/widget/HelpScreens.xml
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Thu Oct 13 13:57:35 2011
> @@ -2,4 +2,4 @@
> /ofbiz/branches/dojo1.4/framework/common/widget/HelpScreens.xml:951708-952957
> /ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml:952958-1044489
> /ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264
> -/ofbiz/trunk/framework/common/widget/HelpScreens.xml:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731
> +/ofbiz/trunk/framework/common/widget/HelpScreens.xml:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731,1182858
>
> Propchange: ofbiz/branches/release11.04/framework/security/data/PasswordSecurityData.xml
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Thu Oct 13 13:57:35 2011
> @@ -2,4 +2,4 @@
> /ofbiz/branches/dojo1.4/applications/securityext/data/PasswordSecurityData.xml:951708-952957
> /ofbiz/branches/jquery/applications/securityext/data/PasswordSecurityData.xml:952958-1044489
> /ofbiz/branches/multitenant20100310/applications/securityext/data/PasswordSecurityData.xml:921280-927264
> -/ofbiz/trunk/framework/security/data/PasswordSecurityData.xml:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731
> +/ofbiz/trunk/framework/security/data/PasswordSecurityData.xml:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731,1182858
>
> Propchange: ofbiz/branches/release11.04/specialpurpose/ebaystore/lib/
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Thu Oct 13 13:57:35 2011
> @@ -2,4 +2,4 @@
> /ofbiz/branches/dojo1.4/specialpurpose/ebaystore/lib:951708-952957
> /ofbiz/branches/jquery/specialpurpose/ebaystore/lib:952958-1044489
> /ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264
> -/ofbiz/trunk/specialpurpose/ebaystore/lib:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731
> +/ofbiz/trunk/specialpurpose/ebaystore/lib:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731,1182858
>
> Propchange: ofbiz/branches/release11.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Thu Oct 13 13:57:35 2011
> @@ -2,4 +2,4 @@
> /ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-952957
> /ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:952958-1044489
> /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264
> -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731
> +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731,1182858
>
> Propchange: ofbiz/branches/release11.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Thu Oct 13 13:57:35 2011
> @@ -2,4 +2,4 @@
> /ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-952957
> /ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:952958-1044489
> /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264
> -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731
> +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731,1182858
>
> Propchange: ofbiz/branches/release11.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Thu Oct 13 13:57:35 2011
> @@ -2,4 +2,4 @@
> /ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-952957
> /ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:952958-1044489
> /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264
> -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731
> +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731,1182858
>
>
Re: svn commit: r1182860 - in /ofbiz/branches/release11.04: ./ applications/order/script/org/ofbiz/order/customer/ applications/party/webapp/partymgr/WEB-INF/actions/party/ applications/product/script/org/ofbiz/product/test/ framework/common/src/org/ofbiz/
Posted by Jacques Le Roux <ja...@les7arts.com>.
Thanks Scott,
It seems I missed a step, sorry, I fix it
Jacques
Scott Gray wrote:
> Jacques, I'm not sure if it's this commit or the last one but the build now fails on the JsLanguageFileMappingCreator.java class.
>
> Please be careful with the release branches.
>
> Thanks
> Scott
>
> On 14/10/2011, at 2:57 AM, jleroux@apache.org wrote:
>
>> Author: jleroux
>> Date: Thu Oct 13 13:57:35 2011
>> New Revision: 1182860
>>
>> URL: http://svn.apache.org/viewvc?rev=1182860&view=rev
>> Log:
>> "Applied fix from trunk for revision: 1182858 "
>> ------------------------------------------------------------------------
>> r1182858 | jleroux | 2011-10-13 15:51:37 +0200 (jeu., 13 oct. 2011) | 2 lines
>>
>> JQuery team does not care about plugins consistency, so we have to be careful. For instance, for more fun: in validate plugin we
>> have also ptpt and ptbr...
>> Just found by chance while looking for consistency in JsLanguageFileMappingCreator class after refactoring
>> ------------------------------------------------------------------------
>>
>>
>> Modified:
>> ofbiz/branches/release11.04/ (props changed)
>> ofbiz/branches/release11.04/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed)
>> ofbiz/branches/release11.04/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props
>> changed) ofbiz/branches/release11.04/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed)
>> ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java
>> ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java
>> ofbiz/branches/release11.04/framework/common/widget/HelpScreens.xml (props changed)
>> ofbiz/branches/release11.04/framework/security/data/PasswordSecurityData.xml (props changed)
>> ofbiz/branches/release11.04/specialpurpose/ebaystore/lib/ (props changed)
>> ofbiz/branches/release11.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed)
>> ofbiz/branches/release11.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed)
>> ofbiz/branches/release11.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props
>> changed)
>>
>> Propchange: ofbiz/branches/release11.04/
>> ------------------------------------------------------------------------------
>> --- svn:mergeinfo (original)
>> +++ svn:mergeinfo Thu Oct 13 13:57:35 2011
>> @@ -2,4 +2,4 @@
>> /ofbiz/branches/dojo1.4:951708-952957
>> /ofbiz/branches/jquery:952958-1044489
>> /ofbiz/branches/multitenant20100310:921280-927264
>> -/ofbiz/trunk:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1133353,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1167606,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731
>> +/ofbiz/trunk:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1133353,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1167606,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731,1182858
>>
>> Propchange: ofbiz/branches/release11.04/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
>> ------------------------------------------------------------------------------
>> --- svn:mergeinfo (original)
>> +++ svn:mergeinfo Thu Oct 13 13:57:35 2011
>> @@ -2,4 +2,4 @@
>> /ofbiz/branches/dojo1.4/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-952957
>> /ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:952958-1044489
>> /ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264
>> -/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731
>> +/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731,1182858
>>
>> Propchange: ofbiz/branches/release11.04/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
>> ------------------------------------------------------------------------------
>> --- svn:mergeinfo (original)
>> +++ svn:mergeinfo Thu Oct 13 13:57:35 2011
>> @@ -2,4 +2,4 @@
>> /ofbiz/branches/dojo1.4/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-952957
>> /ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:952958-1044489
>> /ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:921280-927264
>> -/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731
>> +/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731,1182858
>>
>> Propchange: ofbiz/branches/release11.04/applications/product/script/org/ofbiz/product/test/InventoryTests.xml
>> ------------------------------------------------------------------------------
>> --- svn:mergeinfo (original)
>> +++ svn:mergeinfo Thu Oct 13 13:57:35 2011
>> @@ -2,4 +2,4 @@
>> /ofbiz/branches/dojo1.4/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-952957
>> /ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:952958-1044489
>> /ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:921280-927264
>> -/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731
>> +/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731,1182858
>>
>> Modified: ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java?rev=1182860&r1=1182859&r2=1182860&view=diff
>> ============================================================================== ---
>> ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java (original) +++
>> ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java Thu Oct 13 13:57:35 2011 @@
>> -50,8 +50,10 @@ public class JsLanguageFileMappingCreato for (Locale locale : localeList) {
>> String displayCountry = locale.toString();
>> String modifiedDisplayCountry = null;
>> + String modifiedDisplayCountryForValidation = null;
>> if (displayCountry.indexOf('_') != -1) {
>> modifiedDisplayCountry = displayCountry.replace("_", "-");
>> + modifiedDisplayCountryForValidation = displayCountry.replace("_", "").toLowerCase(); // fun: in validate plugin
>> we have also ptpt and ptbr for instance... } else {
>> modifiedDisplayCountry = displayCountry;
>> }
>> @@ -88,11 +90,19 @@ public class JsLanguageFileMappingCreato
>> */
>> fileName = componentRoot + validateRelPath + validateLocalePrefix + strippedLocale + jsFilePostFix;
>> file = FileUtil.getFile(fileName);
>> +
>> if (file.exists()) {
>> fileUrl = validateRelPath + validateLocalePrefix + strippedLocale + jsFilePostFix;
>> } else {
>> - // use default language en
>> - fileUrl = validateRelPath + validateLocalePrefix + defaultLocaleJquery + jsFilePostFix;
>> + // Try to guess a language (fun: in validate plugin we have also ptpt and ptbr for instance....)
>> + fileName = componentRoot + validateRelPath + validateLocalePrefix + modifiedDisplayCountryForValidation +
>> jsFilePostFix; + file = FileUtil.getFile(fileName);
>> + if (file.exists()) {
>> + fileUrl = validateRelPath + validateLocalePrefix + modifiedDisplayCountryForValidation + jsFilePostFix;
>> + } else {
>> + // use default language en
>> + fileUrl = validateRelPath + validateLocalePrefix + defaultLocaleJquery + jsFilePostFix;
>> + }
>> }
>> validationLocaleFile.put(displayCountry, fileUrl);
>>
>>
>> Modified: ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java?rev=1182860&r1=1182859&r2=1182860&view=diff
>> ============================================================================== ---
>> ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java (original) +++
>> ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java Thu Oct 13 13:57:35 2011 @@ -28,7
>> +28,7 @@ import javolution.util.FastMap;
>> public final class JsLanguageFilesMapping {
>>
>> // DO NOT EDIT THIS FILE! THIS IS AUTO GENERATED AND WILL GET WRITTEN OVER PERIODICALLY WHEN THE DATA CHANGE
>> - // Rather use the createJsLanguageFileMapping to create or update it. You will still need to compile thereafter
>> + // Rather use the createJsLanguageFileMapping service to create or update it. You will still need to compile thereafter
>>
>> public static class datejs {
>>
>> @@ -477,8 +477,8 @@ public final class JsLanguageFilesMappin
>> localeFiles.put("pl", "/images/jquery/plugins/validate/localization/messages_pl.js");
>> localeFiles.put("pl_PL", "/images/jquery/plugins/validate/localization/messages_pl.js");
>> localeFiles.put("pt", "/images/jquery/plugins/validate/localization/messages_en.js");
>> - localeFiles.put("pt_BR", "/images/jquery/plugins/validate/localization/messages_en.js");
>> - localeFiles.put("pt_PT", "/images/jquery/plugins/validate/localization/messages_en.js");
>> + localeFiles.put("pt_BR", "/images/jquery/plugins/validate/localization/messages_ptbr.js");
>> + localeFiles.put("pt_PT", "/images/jquery/plugins/validate/localization/messages_ptpt.js");
>> localeFiles.put("ro", "/images/jquery/plugins/validate/localization/messages_ro.js");
>> localeFiles.put("ro_RO", "/images/jquery/plugins/validate/localization/messages_ro.js");
>> localeFiles.put("ru", "/images/jquery/plugins/validate/localization/messages_ru.js");
>>
>> Propchange: ofbiz/branches/release11.04/framework/common/widget/HelpScreens.xml
>> ------------------------------------------------------------------------------
>> --- svn:mergeinfo (original)
>> +++ svn:mergeinfo Thu Oct 13 13:57:35 2011
>> @@ -2,4 +2,4 @@
>> /ofbiz/branches/dojo1.4/framework/common/widget/HelpScreens.xml:951708-952957
>> /ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml:952958-1044489
>> /ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264
>> -/ofbiz/trunk/framework/common/widget/HelpScreens.xml:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731
>> +/ofbiz/trunk/framework/common/widget/HelpScreens.xml:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731,1182858
>>
>> Propchange: ofbiz/branches/release11.04/framework/security/data/PasswordSecurityData.xml
>> ------------------------------------------------------------------------------
>> --- svn:mergeinfo (original)
>> +++ svn:mergeinfo Thu Oct 13 13:57:35 2011
>> @@ -2,4 +2,4 @@
>> /ofbiz/branches/dojo1.4/applications/securityext/data/PasswordSecurityData.xml:951708-952957
>> /ofbiz/branches/jquery/applications/securityext/data/PasswordSecurityData.xml:952958-1044489
>> /ofbiz/branches/multitenant20100310/applications/securityext/data/PasswordSecurityData.xml:921280-927264
>> -/ofbiz/trunk/framework/security/data/PasswordSecurityData.xml:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731
>> +/ofbiz/trunk/framework/security/data/PasswordSecurityData.xml:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731,1182858
>>
>> Propchange: ofbiz/branches/release11.04/specialpurpose/ebaystore/lib/
>> ------------------------------------------------------------------------------
>> --- svn:mergeinfo (original)
>> +++ svn:mergeinfo Thu Oct 13 13:57:35 2011
>> @@ -2,4 +2,4 @@
>> /ofbiz/branches/dojo1.4/specialpurpose/ebaystore/lib:951708-952957
>> /ofbiz/branches/jquery/specialpurpose/ebaystore/lib:952958-1044489
>> /ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264
>> -/ofbiz/trunk/specialpurpose/ebaystore/lib:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731
>> +/ofbiz/trunk/specialpurpose/ebaystore/lib:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731,1182858
>>
>> Propchange: ofbiz/branches/release11.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
>> ------------------------------------------------------------------------------
>> --- svn:mergeinfo (original)
>> +++ svn:mergeinfo Thu Oct 13 13:57:35 2011
>> @@ -2,4 +2,4 @@
>> /ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-952957
>> /ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:952958-1044489
>> /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264
>> -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731
>> +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731,1182858
>>
>> Propchange: ofbiz/branches/release11.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
>> ------------------------------------------------------------------------------
>> --- svn:mergeinfo (original)
>> +++ svn:mergeinfo Thu Oct 13 13:57:35 2011
>> @@ -2,4 +2,4 @@
>> /ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-952957
>> /ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:952958-1044489
>> /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264
>> -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731
>> +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731,1182858
>>
>> Propchange: ofbiz/branches/release11.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
>> ------------------------------------------------------------------------------
>> --- svn:mergeinfo (original)
>> +++ svn:mergeinfo Thu Oct 13 13:57:35 2011
>> @@ -2,4 +2,4 @@
>> /ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-952957
>> /ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:952958-1044489
>> /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264
>> -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731
>> +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182731,1182858