You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by le...@apache.org on 2009/11/25 23:03:53 UTC
svn commit: r884292 -
/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java
Author: lektran
Date: Wed Nov 25 22:03:53 2009
New Revision: 884292
URL: http://svn.apache.org/viewvc?rev=884292&view=rev
Log:
Fix invalid code that causing the docs-all target to fail
Modified:
ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java
Modified: ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java?rev=884292&r1=884291&r2=884292&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java (original)
+++ ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java Wed Nov 25 22:03:53 2009
@@ -177,7 +177,7 @@
public boolean doesXPDLExist(RepositoryTransaction t, String xpdlId) throws RepositoryException {
List xpdls = this.getXpdlValues(xpdlId, null, false);
- Debug.log(UtilValidate.isNotEmpty(xpdls) ? true : false) + ")", module);
+ Debug.log(UtilValidate.isNotEmpty(xpdls) ? true : false, module);
return (UtilValidate.isNotEmpty(xpdls) ? true : false);
}
Re: svn commit: r884292 - /ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java
Posted by Adrian Crum <ad...@hlmksw.com>.
Jacques Le Roux wrote:
> So build-website and copy-apis targets are also used by scripts ? I
> thought only docs-all was needed ?
I was just guessing, since the folders that weren't found by Contegix
are the same ones you commented out.
-Adrian
Re: svn commit: r884292 - /ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java
Posted by Jacques Le Roux <ja...@les7arts.com>.
From: "Scott Gray" <sc...@hotwaxmedia.com>
> On 26/11/2009, at 11:36 AM, Jacques Le Roux wrote:
>
>> This came from my commit at r886549 <<Use UtilValidate.isNotEmpty methods instead of (obj != null) || (obj.length > 0) and (obj
>> != null) || (obj.size > 0)>>
>> I have fixed it the right way.
>
> I'm guessing this occurred because you were using a regex search and replace, they are useful but you have to be extremely
> careful if you want to avoid unintended changes.
I have been careful, but it's very powefull and I forgot shark+workflow could not be detected :/
>>
>> Yes, it's surprising it passes ant run but not ant docs-all
shark+workflow reason, lesson learned: when doing global search/replace changes beware of them, and even uncomment them in build.xml
to be sure. Even better IMO put them aside to avoid these kind of issues...
> When I get time I'll see if we can get the docs-all target to actually fail the build if it runs into problems so that we get
> notified via buildbot
Without shark+workflow there are any other reason I'm aware of. Finally should we not simply remove them from the docs-all target
(than putting them aside)
>> So build-website and copy-apis targets are also used by scripts ? I thought only docs-all was needed ?
>
> Once again when I get time I'll look through the scripts at Contegix and see what targets are being used, let's leave everything
> as is for now.
Sure! Enough troubles for the week
Jacques
>>
>> Jacques
>>
>> From: "Scott Gray" <sc...@hotwaxmedia.com>
>>> On 26/11/2009, at 11:22 AM, Adam Heath wrote:
>>>
>>>> lektran@apache.org wrote:
>>>>> Author: lektran
>>>>> Date: Wed Nov 25 22:03:53 2009
>>>>> New Revision: 884292
>>>>>
>>>>> URL: http://svn.apache.org/viewvc?rev=884292&view=rev
>>>>> Log:
>>>>> Fix invalid code that causing the docs-all target to fail
>>>>
>>>> If this code isn't built during a normal ant compile run, then the
>>>> docs should also skip it.
>>>>
>>>
>>> Yeah I know, it was just a quick fix to get things running again. I'll take a look at it when I have time unless someone gets
>>> there first.
>>>
>>> Regards
>>> Scott
>>
>>
>
>
Re: svn commit: r884292 - /ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java
Posted by Scott Gray <sc...@hotwaxmedia.com>.
On 26/11/2009, at 11:36 AM, Jacques Le Roux wrote:
> This came from my commit at r886549 <<Use UtilValidate.isNotEmpty
> methods instead of (obj != null) || (obj.length > 0) and (obj !=
> null) || (obj.size > 0)>>
> I have fixed it the right way.
I'm guessing this occurred because you were using a regex search and
replace, they are useful but you have to be extremely careful if you
want to avoid unintended changes.
>
> Yes, it's surprising it passes ant run but not ant docs-all
When I get time I'll see if we can get the docs-all target to actually
fail the build if it runs into problems so that we get notified via
buildbot
> So build-website and copy-apis targets are also used by scripts ? I
> thought only docs-all was needed ?
Once again when I get time I'll look through the scripts at Contegix
and see what targets are being used, let's leave everything as is for
now.
>
> Jacques
>
> From: "Scott Gray" <sc...@hotwaxmedia.com>
>> On 26/11/2009, at 11:22 AM, Adam Heath wrote:
>>
>>> lektran@apache.org wrote:
>>>> Author: lektran
>>>> Date: Wed Nov 25 22:03:53 2009
>>>> New Revision: 884292
>>>>
>>>> URL: http://svn.apache.org/viewvc?rev=884292&view=rev
>>>> Log:
>>>> Fix invalid code that causing the docs-all target to fail
>>>
>>> If this code isn't built during a normal ant compile run, then the
>>> docs should also skip it.
>>>
>>
>> Yeah I know, it was just a quick fix to get things running again.
>> I'll take a look at it when I have time unless someone gets there
>> first.
>>
>> Regards
>> Scott
>
>
Re: svn commit: r884292 - /ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java
Posted by Jacques Le Roux <ja...@les7arts.com>.
This came from my commit at r886549 <<Use UtilValidate.isNotEmpty methods instead of (obj != null) || (obj.length > 0) and (obj !=
null) || (obj.size > 0)>>
I have fixed it the right way.
Yes, it's surprising it passes ant run but not ant docs-all
So build-website and copy-apis targets are also used by scripts ? I thought only docs-all was needed ?
Jacques
From: "Scott Gray" <sc...@hotwaxmedia.com>
> On 26/11/2009, at 11:22 AM, Adam Heath wrote:
>
>> lektran@apache.org wrote:
>>> Author: lektran
>>> Date: Wed Nov 25 22:03:53 2009
>>> New Revision: 884292
>>>
>>> URL: http://svn.apache.org/viewvc?rev=884292&view=rev
>>> Log:
>>> Fix invalid code that causing the docs-all target to fail
>>
>> If this code isn't built during a normal ant compile run, then the
>> docs should also skip it.
>>
>
> Yeah I know, it was just a quick fix to get things running again. I'll take a look at it when I have time unless someone gets
> there first.
>
> Regards
> Scott
Re: svn commit: r884292 - /ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java
Posted by Scott Gray <sc...@hotwaxmedia.com>.
On 26/11/2009, at 11:22 AM, Adam Heath wrote:
> lektran@apache.org wrote:
>> Author: lektran
>> Date: Wed Nov 25 22:03:53 2009
>> New Revision: 884292
>>
>> URL: http://svn.apache.org/viewvc?rev=884292&view=rev
>> Log:
>> Fix invalid code that causing the docs-all target to fail
>
> If this code isn't built during a normal ant compile run, then the
> docs should also skip it.
>
Yeah I know, it was just a quick fix to get things running again.
I'll take a look at it when I have time unless someone gets there first.
Regards
Scott
Re: svn commit: r884292 - /ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java
Posted by Adam Heath <do...@brainfood.com>.
lektran@apache.org wrote:
> Author: lektran
> Date: Wed Nov 25 22:03:53 2009
> New Revision: 884292
>
> URL: http://svn.apache.org/viewvc?rev=884292&view=rev
> Log:
> Fix invalid code that causing the docs-all target to fail
If this code isn't built during a normal ant compile run, then the
docs should also skip it.