Since today the following test is failing:
>>> org.ofbiz.base.util.test.UtilPropertiesTests.testReadXmlLangNewStyle Regards, Hans |
I have noticed the same... it seems to be related to 1304193
Jacopo On Mar 24, 2012, at 12:58 AM, Hans Bakker wrote: > Since today the following test is failing: > > >>> org.ofbiz.base.util.test.UtilPropertiesTests.testReadXmlLangNewStyle > > Regards, > Hans |
Administrator
|
About http://svn.apache.org/viewvc?rev=1304193&view=rev
I did not run the tests locally. It's a pity Buildbot is still not working. Hopefully this should be soon fixed https://issues.apache.org/jira/browse/INFRA-4562 There are indeed chances that it's related, Anne introduced LangNewStyle changes. I guess it's not blocking anybody at the moment If Anne does not get a chance to look at her changes (https://issues.apache.org/jira/browse/OFBIZ-4723) I will do Jacques From: "Jacopo Cappellato" <[hidden email]> >I have noticed the same... it seems to be related to 1304193 > > Jacopo > > On Mar 24, 2012, at 12:58 AM, Hans Bakker wrote: > >> Since today the following test is failing: >> >> >>> org.ofbiz.base.util.test.UtilPropertiesTests.testReadXmlLangNewStyle >> >> Regards, >> Hans > |
I suspect that in Anne's local box the tests will be successful (the test that is failing is using en-AU as a Locale and it may be related...)
Jacopo On Mar 24, 2012, at 9:43 AM, Jacques Le Roux wrote: > About http://svn.apache.org/viewvc?rev=1304193&view=rev > I did not run the tests locally. It's a pity Buildbot is still not working. Hopefully this should be soon fixed https://issues.apache.org/jira/browse/INFRA-4562 > > There are indeed chances that it's related, Anne introduced LangNewStyle changes. > > I guess it's not blocking anybody at the moment > If Anne does not get a chance to look at her changes (https://issues.apache.org/jira/browse/OFBIZ-4723) I will do > > Jacques > > From: "Jacopo Cappellato" <[hidden email]> >> I have noticed the same... it seems to be related to 1304193 >> >> Jacopo >> >> On Mar 24, 2012, at 12:58 AM, Hans Bakker wrote: >> >>> Since today the following test is failing: >>> >>> >>> org.ofbiz.base.util.test.UtilPropertiesTests.testReadXmlLangNewStyle >>> >>> Regards, >>> Hans |
Administrator
|
Ha yes indeed saw that, I will check here, thanks Jacopo
Jacques From: "Jacopo Cappellato" <[hidden email]> >I suspect that in Anne's local box the tests will be successful (the test that is failing is using en-AU as a Locale and it may be >related...) > > Jacopo > > On Mar 24, 2012, at 9:43 AM, Jacques Le Roux wrote: > >> About http://svn.apache.org/viewvc?rev=1304193&view=rev >> I did not run the tests locally. It's a pity Buildbot is still not working. Hopefully this should be soon fixed >> https://issues.apache.org/jira/browse/INFRA-4562 >> >> There are indeed chances that it's related, Anne introduced LangNewStyle changes. >> >> I guess it's not blocking anybody at the moment >> If Anne does not get a chance to look at her changes (https://issues.apache.org/jira/browse/OFBIZ-4723) I will do >> >> Jacques >> >> From: "Jacopo Cappellato" <[hidden email]> >>> I have noticed the same... it seems to be related to 1304193 >>> >>> Jacopo >>> >>> On Mar 24, 2012, at 12:58 AM, Hans Bakker wrote: >>> >>>> Since today the following test is failing: >>>> >>>> >>> org.ofbiz.base.util.test.UtilPropertiesTests.testReadXmlLangNewStyle >>>> >>>> Regards, >>>> Hans > > |
In reply to this post by Jacopo Cappellato-4
Paul mentioned this to me, so I have just had a look.
Something has gone wrong with the application of my patch. The commit log lists these files: Changed paths: M /ofbiz/trunk/framework/base/dtd/ofbiz-properties.xsd A /ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/UtilPropertiesTests.java M /ofbiz/trunk/framework/base/testdef/basetests.xml M /ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelInfo.java M /ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java M /ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java but my patches for OFBIZ-4723 affect these files: framework/base/src/org/ofbiz/base/util/UtilProperties.java framework/base/src/org/ofbiz/base/util/test/UtilPropertiesTests.java framework/base/dtd/ofbiz-properties.xsd framework/base/testdef/basetests.xml framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java framework/webtools/src/org/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelInfo.java Notice the commit doesn't include UtilProperties.java, which is the change that the unit test is actually testing. Perhaps the patch needs to be re-applied? Cheers, Anne. On 24 March 2012 19:49, Jacopo Cappellato <[hidden email] > wrote: > I suspect that in Anne's local box the tests will be successful (the test > that is failing is using en-AU as a Locale and it may be related...) > > Jacopo > > On Mar 24, 2012, at 9:43 AM, Jacques Le Roux wrote: > > > About http://svn.apache.org/viewvc?rev=1304193&view=rev > > I did not run the tests locally. It's a pity Buildbot is still not > working. Hopefully this should be soon fixed > https://issues.apache.org/jira/browse/INFRA-4562 > > > > There are indeed chances that it's related, Anne introduced LangNewStyle > changes. > > > > I guess it's not blocking anybody at the moment > > If Anne does not get a chance to look at her changes ( > https://issues.apache.org/jira/browse/OFBIZ-4723) I will do > > > > Jacques > > > > From: "Jacopo Cappellato" <[hidden email]> > >> I have noticed the same... it seems to be related to 1304193 > >> > >> Jacopo > >> > >> On Mar 24, 2012, at 12:58 AM, Hans Bakker wrote: > >> > >>> Since today the following test is failing: > >>> > >>> >>> > org.ofbiz.base.util.test.UtilPropertiesTests.testReadXmlLangNewStyle > >>> > >>> Regards, > >>> Hans > > -- Coherent Software Australia Pty Ltd PO Box 2773 Cheltenham Vic 3192 Phone: (03) 9585 6788 Fax: (03) 9585 1086 Web: http://www.cohsoft.com.au/ Email: [hidden email] Bonsai ERP, the all-inclusive ERP system http://www.bonsaierp.com.au/ |
Administrator
|
Indeed, it seems I did not notice this part is rejected, I will apply by hand
--- framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java +++ framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java @@ -132,7 +132,12 @@ for (Node valueNode : UtilXml.childNodeList(propertyElem.getFirstChild())) { if (valueNode instanceof Element) { Element valueElem = (Element) valueNode; + // Support old way of specifying xml:lang value. + // Old way: en_AU, new way: en-AU String localeName = valueElem.getAttribute("xml:lang"); + if( localeName.contains("_")) { + localeName = localeName.replace('_', '-'); + } String labelValue = StringUtil.defaultWebEncoder.canonicalize(UtilXml.nodeValue(valueElem.getFirstChild())); LabelInfo label = labels.get(labelKey + keySeparator + fileInfo.getFileName()); Jacques From: "Anne" <[hidden email]> > Paul mentioned this to me, so I have just had a look. > > Something has gone wrong with the application of my patch. The commit log > lists these files: > Changed paths: > M /ofbiz/trunk/framework/base/dtd/ofbiz-properties.xsd > A > /ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/UtilPropertiesTests.java > M /ofbiz/trunk/framework/base/testdef/basetests.xml > M > /ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelInfo.java > M > /ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java > M > /ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java > > but my patches for OFBIZ-4723 affect these files: > > framework/base/src/org/ofbiz/base/util/UtilProperties.java > framework/base/src/org/ofbiz/base/util/test/UtilPropertiesTests.java > framework/base/dtd/ofbiz-properties.xsd > framework/base/testdef/basetests.xml > framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java > framework/webtools/src/org/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java > framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelInfo.java > > Notice the commit doesn't include UtilProperties.java, which is the change > that the unit test is actually testing. Perhaps the patch needs to be > re-applied? > > Cheers, > Anne. > > > > > On 24 March 2012 19:49, Jacopo Cappellato <[hidden email] >> wrote: > >> I suspect that in Anne's local box the tests will be successful (the test >> that is failing is using en-AU as a Locale and it may be related...) >> >> Jacopo >> >> On Mar 24, 2012, at 9:43 AM, Jacques Le Roux wrote: >> >> > About http://svn.apache.org/viewvc?rev=1304193&view=rev >> > I did not run the tests locally. It's a pity Buildbot is still not >> working. Hopefully this should be soon fixed >> https://issues.apache.org/jira/browse/INFRA-4562 >> > >> > There are indeed chances that it's related, Anne introduced LangNewStyle >> changes. >> > >> > I guess it's not blocking anybody at the moment >> > If Anne does not get a chance to look at her changes ( >> https://issues.apache.org/jira/browse/OFBIZ-4723) I will do >> > >> > Jacques >> > >> > From: "Jacopo Cappellato" <[hidden email]> >> >> I have noticed the same... it seems to be related to 1304193 >> >> >> >> Jacopo >> >> >> >> On Mar 24, 2012, at 12:58 AM, Hans Bakker wrote: >> >> >> >>> Since today the following test is failing: >> >>> >> >>> >>> >> org.ofbiz.base.util.test.UtilPropertiesTests.testReadXmlLangNewStyle >> >>> >> >>> Regards, >> >>> Hans >> >> > > > -- > Coherent Software Australia Pty Ltd > PO Box 2773 > Cheltenham Vic 3192 > Phone: (03) 9585 6788 > Fax: (03) 9585 1086 > Web: http://www.cohsoft.com.au/ > Email: [hidden email] > > Bonsai ERP, the all-inclusive ERP system > http://www.bonsaierp.com.au/ > |
Administrator
|
In reply to this post by hans_bakker
Mmm., no it was already applied. So I reapplied both patches and apart this hunk all went smoothly and I have nothing new to commit:
I revert r1304193 for now... Jacques From: "Jacques Le Roux" <[hidden email]> > Indeed, it seems I did not notice this part is rejected, I will apply by hand > > --- framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java > +++ framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java > @@ -132,7 +132,12 @@ > for (Node valueNode : UtilXml.childNodeList(propertyElem.getFirstChild())) { > if (valueNode instanceof Element) { > Element valueElem = (Element) valueNode; > + // Support old way of specifying xml:lang value. > + // Old way: en_AU, new way: en-AU > String localeName = valueElem.getAttribute("xml:lang"); > + if( localeName.contains("_")) { > + localeName = localeName.replace('_', '-'); > + } > String labelValue = > StringUtil.defaultWebEncoder.canonicalize(UtilXml.nodeValue(valueElem.getFirstChild())); > LabelInfo label = labels.get(labelKey + keySeparator + fileInfo.getFileName()); > Jacques > > From: "Anne" <[hidden email]> >> Paul mentioned this to me, so I have just had a look. >> >> Something has gone wrong with the application of my patch. The commit log >> lists these files: >> Changed paths: >> M /ofbiz/trunk/framework/base/dtd/ofbiz-properties.xsd >> A >> /ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/UtilPropertiesTests.java >> M /ofbiz/trunk/framework/base/testdef/basetests.xml >> M >> /ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelInfo.java >> M >> /ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java >> M >> /ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java >> >> but my patches for OFBIZ-4723 affect these files: >> >> framework/base/src/org/ofbiz/base/util/UtilProperties.java >> framework/base/src/org/ofbiz/base/util/test/UtilPropertiesTests.java >> framework/base/dtd/ofbiz-properties.xsd >> framework/base/testdef/basetests.xml >> framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java >> framework/webtools/src/org/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java >> framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelInfo.java >> >> Notice the commit doesn't include UtilProperties.java, which is the change >> that the unit test is actually testing. Perhaps the patch needs to be >> re-applied? >> >> Cheers, >> Anne. >> >> >> >> >> On 24 March 2012 19:49, Jacopo Cappellato <[hidden email] >>> wrote: >> >>> I suspect that in Anne's local box the tests will be successful (the test >>> that is failing is using en-AU as a Locale and it may be related...) >>> >>> Jacopo >>> >>> On Mar 24, 2012, at 9:43 AM, Jacques Le Roux wrote: >>> >>> > About http://svn.apache.org/viewvc?rev=1304193&view=rev >>> > I did not run the tests locally. It's a pity Buildbot is still not >>> working. Hopefully this should be soon fixed >>> https://issues.apache.org/jira/browse/INFRA-4562 >>> > >>> > There are indeed chances that it's related, Anne introduced LangNewStyle >>> changes. >>> > >>> > I guess it's not blocking anybody at the moment >>> > If Anne does not get a chance to look at her changes ( >>> https://issues.apache.org/jira/browse/OFBIZ-4723) I will do >>> > >>> > Jacques >>> > >>> > From: "Jacopo Cappellato" <[hidden email]> >>> >> I have noticed the same... it seems to be related to 1304193 >>> >> >>> >> Jacopo >>> >> >>> >> On Mar 24, 2012, at 12:58 AM, Hans Bakker wrote: >>> >> >>> >>> Since today the following test is failing: >>> >>> >>> >>> >>> >>> org.ofbiz.base.util.test.UtilPropertiesTests.testReadXmlLangNewStyle >>> >>> >>> >>> Regards, >>> >>> Hans >>> >>> >> >> >> -- >> Coherent Software Australia Pty Ltd >> PO Box 2773 >> Cheltenham Vic 3192 >> Phone: (03) 9585 6788 >> Fax: (03) 9585 1086 >> Web: http://www.cohsoft.com.au/ >> Email: [hidden email] >> >> Bonsai ERP, the all-inclusive ERP system >> http://www.bonsaierp.com.au/ >> > |
In reply to this post by Jacques Le Roux
Thanks Jacques. Could you please also check that the patch hunk for
UtilProperties.java, starting at line 964, applies successfully? It applies cleanly on my local copy. Cheers, Anne. On 24 March 2012 20:25, Jacques Le Roux <[hidden email]>wrote: > Indeed, it seems I did not notice this part is rejected, I will apply by > hand > > --- framework/webtools/src/org/**ofbiz/webtools/labelmanager/** > LabelManagerFactory.java > +++ framework/webtools/src/org/**ofbiz/webtools/labelmanager/** > LabelManagerFactory.java > @@ -132,7 +132,12 @@ > for (Node valueNode : UtilXml.childNodeList(**propertyElem.getFirstChild())) > { > if (valueNode instanceof Element) { > Element valueElem = (Element) valueNode; > + // Support old way of specifying xml:lang > value. > + // Old way: en_AU, new way: en-AU > String localeName = valueElem.getAttribute("xml: > **lang"); > + if( localeName.contains("_")) { > + localeName = localeName.replace('_', '-'); > + } > String labelValue = > StringUtil.defaultWebEncoder.**canonicalize(UtilXml.**nodeValue(valueElem. > **getFirstChild())); > LabelInfo label = labels.get(labelKey + > keySeparator + fileInfo.getFileName()); > Jacques > > From: "Anne" <[hidden email]> > > Paul mentioned this to me, so I have just had a look. >> >> Something has gone wrong with the application of my patch. The commit log >> lists these files: >> Changed paths: >> M /ofbiz/trunk/framework/base/**dtd/ofbiz-properties.xsd >> A >> /ofbiz/trunk/framework/base/**src/org/ofbiz/base/util/test/** >> UtilPropertiesTests.java >> M /ofbiz/trunk/framework/base/**testdef/basetests.xml >> M >> /ofbiz/trunk/framework/**webtools/src/org/ofbiz/**webtools/labelmanager/* >> *LabelInfo.java >> M >> /ofbiz/trunk/framework/**webtools/src/org/ofbiz/**webtools/labelmanager/* >> *LabelManagerFactory.java >> M >> /ofbiz/trunk/framework/**webtools/src/org/ofbiz/**webtools/labelmanager/* >> *SaveLabelsToXmlFile.java >> >> but my patches for OFBIZ-4723 affect these files: >> >> framework/base/src/org/ofbiz/**base/util/UtilProperties.java >> framework/base/src/org/ofbiz/**base/util/test/**UtilPropertiesTests.java >> framework/base/dtd/ofbiz-**properties.xsd >> framework/base/testdef/**basetests.xml >> framework/webtools/src/org/**ofbiz/webtools/labelmanager/** >> LabelManagerFactory.java >> framework/webtools/src/org/**ofbiz/webtools/labelmanager/** >> SaveLabelsToXmlFile.java >> framework/webtools/src/org/**ofbiz/webtools/labelmanager/**LabelInfo.java >> >> Notice the commit doesn't include UtilProperties.java, which is the change >> that the unit test is actually testing. Perhaps the patch needs to be >> re-applied? >> >> Cheers, >> Anne. >> >> >> >> >> On 24 March 2012 19:49, Jacopo Cappellato <jacopo.cappellato@** >> hotwaxmedia.com <[hidden email]> >> >>> wrote: >>> >> >> I suspect that in Anne's local box the tests will be successful (the test >>> that is failing is using en-AU as a Locale and it may be related...) >>> >>> Jacopo >>> >>> On Mar 24, 2012, at 9:43 AM, Jacques Le Roux wrote: >>> >>> > About http://svn.apache.org/viewvc?**rev=1304193&view=rev<http://svn.apache.org/viewvc?rev=1304193&view=rev> >>> > I did not run the tests locally. It's a pity Buildbot is still not >>> working. Hopefully this should be soon fixed >>> https://issues.apache.org/**jira/browse/INFRA-4562<https://issues.apache.org/jira/browse/INFRA-4562> >>> > >>> > There are indeed chances that it's related, Anne introduced >>> LangNewStyle >>> changes. >>> > >>> > I guess it's not blocking anybody at the moment >>> > If Anne does not get a chance to look at her changes ( >>> https://issues.apache.org/**jira/browse/OFBIZ-4723<https://issues.apache.org/jira/browse/OFBIZ-4723>) >>> I will do >>> > >>> > Jacques >>> > >>> > From: "Jacopo Cappellato" <jacopo.cappellato@**hotwaxmedia.com<[hidden email]> >>> > >>> >> I have noticed the same... it seems to be related to 1304193 >>> >> >>> >> Jacopo >>> >> >>> >> On Mar 24, 2012, at 12:58 AM, Hans Bakker wrote: >>> >> >>> >>> Since today the following test is failing: >>> >>> >>> >>> >>> >>> org.ofbiz.base.util.test.**UtilPropertiesTests.**testReadXmlLangNewStyle >>> >>> >>> >>> Regards, >>> >>> Hans >>> >>> >>> >> >> -- >> Coherent Software Australia Pty Ltd >> PO Box 2773 >> Cheltenham Vic 3192 >> Phone: (03) 9585 6788 >> Fax: (03) 9585 1086 >> Web: http://www.cohsoft.com.au/ >> Email: [hidden email] >> >> Bonsai ERP, the all-inclusive ERP system >> http://www.bonsaierp.com.au/ >> >> -- Coherent Software Australia Pty Ltd PO Box 2773 Cheltenham Vic 3192 Phone: (03) 9585 6788 Fax: (03) 9585 1086 Web: http://www.cohsoft.com.au/ Email: [hidden email] Bonsai ERP, the all-inclusive ERP system http://www.bonsaierp.com.au/ |
Administrator
|
I reapplied both patches in the right order (I did care about this point last time I think, anyway did not get any rejects)
And I have applied the resulting patch to the issue, please check Thanks Jacques From: "Anne" <[hidden email]> > Thanks Jacques. Could you please also check that the patch hunk for > UtilProperties.java, starting at line 964, applies successfully? It applies > cleanly on my local copy. > > Cheers, > Anne. > > On 24 March 2012 20:25, Jacques Le Roux <[hidden email]>wrote: > >> Indeed, it seems I did not notice this part is rejected, I will apply by >> hand >> >> --- framework/webtools/src/org/**ofbiz/webtools/labelmanager/** >> LabelManagerFactory.java >> +++ framework/webtools/src/org/**ofbiz/webtools/labelmanager/** >> LabelManagerFactory.java >> @@ -132,7 +132,12 @@ >> for (Node valueNode : UtilXml.childNodeList(**propertyElem.getFirstChild())) >> { >> if (valueNode instanceof Element) { >> Element valueElem = (Element) valueNode; >> + // Support old way of specifying xml:lang >> value. >> + // Old way: en_AU, new way: en-AU >> String localeName = valueElem.getAttribute("xml: >> **lang"); >> + if( localeName.contains("_")) { >> + localeName = localeName.replace('_', '-'); >> + } >> String labelValue = >> StringUtil.defaultWebEncoder.**canonicalize(UtilXml.**nodeValue(valueElem. >> **getFirstChild())); >> LabelInfo label = labels.get(labelKey + >> keySeparator + fileInfo.getFileName()); >> Jacques >> >> From: "Anne" <[hidden email]> >> >> Paul mentioned this to me, so I have just had a look. >>> >>> Something has gone wrong with the application of my patch. The commit log >>> lists these files: >>> Changed paths: >>> M /ofbiz/trunk/framework/base/**dtd/ofbiz-properties.xsd >>> A >>> /ofbiz/trunk/framework/base/**src/org/ofbiz/base/util/test/** >>> UtilPropertiesTests.java >>> M /ofbiz/trunk/framework/base/**testdef/basetests.xml >>> M >>> /ofbiz/trunk/framework/**webtools/src/org/ofbiz/**webtools/labelmanager/* >>> *LabelInfo.java >>> M >>> /ofbiz/trunk/framework/**webtools/src/org/ofbiz/**webtools/labelmanager/* >>> *LabelManagerFactory.java >>> M >>> /ofbiz/trunk/framework/**webtools/src/org/ofbiz/**webtools/labelmanager/* >>> *SaveLabelsToXmlFile.java >>> >>> but my patches for OFBIZ-4723 affect these files: >>> >>> framework/base/src/org/ofbiz/**base/util/UtilProperties.java >>> framework/base/src/org/ofbiz/**base/util/test/**UtilPropertiesTests.java >>> framework/base/dtd/ofbiz-**properties.xsd >>> framework/base/testdef/**basetests.xml >>> framework/webtools/src/org/**ofbiz/webtools/labelmanager/** >>> LabelManagerFactory.java >>> framework/webtools/src/org/**ofbiz/webtools/labelmanager/** >>> SaveLabelsToXmlFile.java >>> framework/webtools/src/org/**ofbiz/webtools/labelmanager/**LabelInfo.java >>> >>> Notice the commit doesn't include UtilProperties.java, which is the change >>> that the unit test is actually testing. Perhaps the patch needs to be >>> re-applied? >>> >>> Cheers, >>> Anne. >>> >>> >>> >>> >>> On 24 March 2012 19:49, Jacopo Cappellato <jacopo.cappellato@** >>> hotwaxmedia.com <[hidden email]> >>> >>>> wrote: >>>> >>> >>> I suspect that in Anne's local box the tests will be successful (the test >>>> that is failing is using en-AU as a Locale and it may be related...) >>>> >>>> Jacopo >>>> >>>> On Mar 24, 2012, at 9:43 AM, Jacques Le Roux wrote: >>>> >>>> > About http://svn.apache.org/viewvc?**rev=1304193&view=rev<http://svn.apache.org/viewvc?rev=1304193&view=rev> >>>> > I did not run the tests locally. It's a pity Buildbot is still not >>>> working. Hopefully this should be soon fixed >>>> https://issues.apache.org/**jira/browse/INFRA-4562<https://issues.apache.org/jira/browse/INFRA-4562> >>>> > >>>> > There are indeed chances that it's related, Anne introduced >>>> LangNewStyle >>>> changes. >>>> > >>>> > I guess it's not blocking anybody at the moment >>>> > If Anne does not get a chance to look at her changes ( >>>> https://issues.apache.org/**jira/browse/OFBIZ-4723<https://issues.apache.org/jira/browse/OFBIZ-4723>) >>>> I will do >>>> > >>>> > Jacques >>>> > >>>> > From: "Jacopo Cappellato" <jacopo.cappellato@**hotwaxmedia.com<[hidden email]> >>>> > >>>> >> I have noticed the same... it seems to be related to 1304193 >>>> >> >>>> >> Jacopo >>>> >> >>>> >> On Mar 24, 2012, at 12:58 AM, Hans Bakker wrote: >>>> >> >>>> >>> Since today the following test is failing: >>>> >>> >>>> >>> >>> >>>> org.ofbiz.base.util.test.**UtilPropertiesTests.**testReadXmlLangNewStyle >>>> >>> >>>> >>> Regards, >>>> >>> Hans >>>> >>>> >>>> >>> >>> -- >>> Coherent Software Australia Pty Ltd >>> PO Box 2773 >>> Cheltenham Vic 3192 >>> Phone: (03) 9585 6788 >>> Fax: (03) 9585 1086 >>> Web: http://www.cohsoft.com.au/ >>> Email: [hidden email] >>> >>> Bonsai ERP, the all-inclusive ERP system >>> http://www.bonsaierp.com.au/ >>> >>> > > > -- > Coherent Software Australia Pty Ltd > PO Box 2773 > Cheltenham Vic 3192 > Phone: (03) 9585 6788 > Fax: (03) 9585 1086 > Web: http://www.cohsoft.com.au/ > Email: [hidden email] > > Bonsai ERP, the all-inclusive ERP system > http://www.bonsaierp.com.au/ > |
Jacques,
The patch you added to jira does not include the changes to UtilProperties.java. When I apply my original patch to my local copy of trunk, it all applies cleanly. I can't see what is going wrong. I will create a new combined patch and add it to the jira. Maybe it will be simpler to see what is wrong then. Cheers, Anne. On 24 March 2012 20:46, Jacques Le Roux <[hidden email]>wrote: > I reapplied both patches in the right order (I did care about this point > last time I think, anyway did not get any rejects) > And I have applied the resulting patch to the issue, please check > > Thanks > > Jacques > > From: "Anne" <[hidden email]> > >> Thanks Jacques. Could you please also check that the patch hunk for >> UtilProperties.java, starting at line 964, applies successfully? It >> applies >> cleanly on my local copy. >> >> Cheers, >> Anne. >> >> On 24 March 2012 20:25, Jacques Le Roux <[hidden email]>** >> wrote: >> >> Indeed, it seems I did not notice this part is rejected, I will apply by >>> hand >>> >>> --- framework/webtools/src/org/****ofbiz/webtools/labelmanager/** >>> LabelManagerFactory.java >>> +++ framework/webtools/src/org/****ofbiz/webtools/labelmanager/** >>> >>> LabelManagerFactory.java >>> @@ -132,7 +132,12 @@ >>> for (Node valueNode : UtilXml.childNodeList(**** >>> propertyElem.getFirstChild())) >>> >>> { >>> if (valueNode instanceof Element) { >>> Element valueElem = (Element) valueNode; >>> + // Support old way of specifying xml:lang >>> value. >>> + // Old way: en_AU, new way: en-AU >>> String localeName = >>> valueElem.getAttribute("xml: >>> **lang"); >>> >>> + if( localeName.contains("_")) { >>> + localeName = localeName.replace('_', >>> '-'); >>> + } >>> String labelValue = >>> StringUtil.defaultWebEncoder.****canonicalize(UtilXml.**** >>> nodeValue(valueElem. >>> **getFirstChild())); >>> >>> LabelInfo label = labels.get(labelKey + >>> keySeparator + fileInfo.getFileName()); >>> Jacques >>> >>> From: "Anne" <[hidden email]> >>> >>> Paul mentioned this to me, so I have just had a look. >>> >>>> >>>> Something has gone wrong with the application of my patch. The commit >>>> log >>>> lists these files: >>>> Changed paths: >>>> M /ofbiz/trunk/framework/base/****dtd/ofbiz-properties.xsd >>>> A >>>> /ofbiz/trunk/framework/base/****src/org/ofbiz/base/util/test/**** >>>> UtilPropertiesTests.java >>>> M /ofbiz/trunk/framework/base/****testdef/basetests.xml >>>> M >>>> /ofbiz/trunk/framework/****webtools/src/org/ofbiz/**** >>>> webtools/labelmanager/* >>>> *LabelInfo.java >>>> M >>>> /ofbiz/trunk/framework/****webtools/src/org/ofbiz/**** >>>> webtools/labelmanager/* >>>> *LabelManagerFactory.java >>>> M >>>> /ofbiz/trunk/framework/****webtools/src/org/ofbiz/**** >>>> webtools/labelmanager/* >>>> >>>> *SaveLabelsToXmlFile.java >>>> >>>> but my patches for OFBIZ-4723 affect these files: >>>> >>>> framework/base/src/org/ofbiz/****base/util/UtilProperties.java >>>> framework/base/src/org/ofbiz/****base/util/test/**** >>>> UtilPropertiesTests.java >>>> framework/base/dtd/ofbiz-****properties.xsd >>>> framework/base/testdef/****basetests.xml >>>> framework/webtools/src/org/****ofbiz/webtools/labelmanager/** >>>> LabelManagerFactory.java >>>> framework/webtools/src/org/****ofbiz/webtools/labelmanager/** >>>> SaveLabelsToXmlFile.java >>>> framework/webtools/src/org/****ofbiz/webtools/labelmanager/**** >>>> LabelInfo.java >>>> >>>> >>>> Notice the commit doesn't include UtilProperties.java, which is the >>>> change >>>> that the unit test is actually testing. Perhaps the patch needs to be >>>> re-applied? >>>> >>>> Cheers, >>>> Anne. >>>> >>>> >>>> >>>> >>>> On 24 March 2012 19:49, Jacopo Cappellato <jacopo.cappellato@** >>>> hotwaxmedia.com <jacopo.cappellato@**hotwaxmedia.com<[hidden email]> >>>> > >>>> >>>> >>>> wrote: >>>>> >>>>> >>>> I suspect that in Anne's local box the tests will be successful (the >>>> test >>>> >>>>> that is failing is using en-AU as a Locale and it may be related...) >>>>> >>>>> Jacopo >>>>> >>>>> On Mar 24, 2012, at 9:43 AM, Jacques Le Roux wrote: >>>>> >>>>> > About http://svn.apache.org/viewvc?****rev=1304193&view=rev<http://svn.apache.org/viewvc?**rev=1304193&view=rev> >>>>> <http://**svn.apache.org/viewvc?rev=**1304193&view=rev<http://svn.apache.org/viewvc?rev=1304193&view=rev> >>>>> > >>>>> >>>>> > I did not run the tests locally. It's a pity Buildbot is still not >>>>> working. Hopefully this should be soon fixed >>>>> https://issues.apache.org/****jira/browse/INFRA-4562<https://issues.apache.org/**jira/browse/INFRA-4562> >>>>> <https:/**/issues.apache.org/jira/**browse/INFRA-4562<https://issues.apache.org/jira/browse/INFRA-4562> >>>>> > >>>>> >>>>> > >>>>> > There are indeed chances that it's related, Anne introduced >>>>> LangNewStyle >>>>> changes. >>>>> > >>>>> > I guess it's not blocking anybody at the moment >>>>> > If Anne does not get a chance to look at her changes ( >>>>> https://issues.apache.org/****jira/browse/OFBIZ-4723<https://issues.apache.org/**jira/browse/OFBIZ-4723> >>>>> <https:/**/issues.apache.org/jira/**browse/OFBIZ-4723<https://issues.apache.org/jira/browse/OFBIZ-4723> >>>>> >) >>>>> I will do >>>>> > >>>>> > Jacques >>>>> > >>>>> > From: "Jacopo Cappellato" <jacopo.cappellato@**hotwaxmed**ia.com<http://hotwaxmedia.com> >>>>> <jacopo.cappellato@**hotwaxmedia.com<[hidden email]> >>>>> > >>>>> >>>>> > >>>>> >> I have noticed the same... it seems to be related to 1304193 >>>>> >> >>>>> >> Jacopo >>>>> >> >>>>> >> On Mar 24, 2012, at 12:58 AM, Hans Bakker wrote: >>>>> >> >>>>> >>> Since today the following test is failing: >>>>> >>> >>>>> >>> >>> >>>>> org.ofbiz.base.util.test.****UtilPropertiesTests.**** >>>>> testReadXmlLangNewStyle >>>>> >>> >>>>> >>> Regards, >>>>> >>> Hans >>>>> >>>>> >>>>> >>>>> >>>> -- >>>> Coherent Software Australia Pty Ltd >>>> PO Box 2773 >>>> Cheltenham Vic 3192 >>>> Phone: (03) 9585 6788 >>>> Fax: (03) 9585 1086 >>>> Web: http://www.cohsoft.com.au/ >>>> Email: [hidden email] >>>> >>>> Bonsai ERP, the all-inclusive ERP system >>>> http://www.bonsaierp.com.au/ >>>> >>>> >>>> >> >> -- >> Coherent Software Australia Pty Ltd >> PO Box 2773 >> Cheltenham Vic 3192 >> Phone: (03) 9585 6788 >> Fax: (03) 9585 1086 >> Web: http://www.cohsoft.com.au/ >> Email: [hidden email] >> >> Bonsai ERP, the all-inclusive ERP system >> http://www.bonsaierp.com.au/ >> >> -- Coherent Software Australia Pty Ltd PO Box 2773 Cheltenham Vic 3192 Phone: (03) 9585 6788 Fax: (03) 9585 1086 Web: http://www.cohsoft.com.au/ Email: [hidden email] Bonsai ERP, the all-inclusive ERP system http://www.bonsaierp.com.au/ |
Free forum by Nabble | Edit this page |