Login  Register

Re: Patch for 4.0 framework

Posted by David E Jones on Apr 26, 2007; 11:25pm
URL: http://ofbiz.116.s1.nabble.com/Patch-for-4-0-framework-tp180484p180486.html


I'll go ahead and merge these over.

This does bring up some questions about how to manage stuff with the  
release branch, mostly how to coordinate things among committers and  
such.

I think we'll be changing commit rights so that all committers can  
commit to the branch, but we'll need and have some guidelines to help  
minimize risk in doing so (mainly people working on areas that they  
aren't very familiar with).

1. in general (trunk or branch) when working on an area of the  
project that you are not familiar with, don't worry about getting it  
done fast, just create a Jira issue with your patch and request  
comments on it (in the task or with a dev list message)

2. when working on a branch when a change comes over from the trunk  
the merge command should be used rather than creating a big patch  
like this; doing it this way is less error prone and makes tracking  
changes in the branch (which should be tightly monitored) a lot  
easier; the command would be something like this:

(from a checkout of the branch, in the ofbiz.home directory):
# svn merge -r ${revision-1}:${revison} http://svn.apache.org/repos/ 
asf/incubator/ofbiz/trunk
# svn commit -m "Applied fix from trunk for revision: ${revision}"

-David


On Apr 26, 2007, at 10:07 AM, Anil Patel wrote:

> Applied the attached patch to my installation of Asset Maintenance  
> application that's now running on 4.0 branch. Tested operations in  
> assetmaint component and found to work fine.
>
> Minor change in patch attached to this file. I removed C:/ofbiz4.0/  
> from the files path.
>
> Apply this patch to 4.0 branch
>
> +1
>
>
> Regards
> Anil Patel
>
>
> On 4/26/07, Scott Gray <[hidden email] > wrote:Here's a patch  
> for some recent commits to the trunk that can also be applied to 4.0:
> rev. 532040: added log message when error
> rev. 532041: fixed bugs in truststore loading; added method to load  
> the keystore from the configuration
> rev. 532068: added missing keystore element
> rev. 532069: now checking issuer serial number as well; one more  
> layer of additional security
> rev. 532591(partial): removed no longer needed debugging
> rev. 532595: fixed X500 converter to support commas in names  
> (broken since it is split on comma)
>
> Hopefully the attachment will go through...
>
> Regards
> Scott
>
>
>
> <framework.patch>


smime.p7s (3K) Download Attachment