Hi Chris, Patch type A are source code patches which are merged to the Stratos source code. Patch type B are binary patches which are meant to be applied to a running Stratos setup. So Stratos commiters will not provide them.
Above is the short answer for the query.Let me explain more a bit. Lets say a user has a Stratos setup up and running where he finds an issue in Stratos. Then he will report it via a Jira. Then someone will look into it and will provide a fix for it if it is a bug in the system. The fix will be done in the current working branch (Ex. master). It is a source patch which is type A. Assume that patch is for CC component. Then the user can apply the source patch to his repo or get a repo update. He can build the CC component with the new fix and he now get the fixed jar. Now you can apply the newly fixed JAR to your Stratos system as a type B patch. I hope you understood the difference between those two. On Mon, Jun 30, 2014 at 10:00 AM, Praneesha Chandrasiri <pranee...@wso2.com> wrote: > Hi Udara, > > Would you please help me to provide answers to the further doubts > mentioned by Chris in [1] as follows? > > I'm still a bit confused. It seems that there are two types of patches: > > A) diffs created using a version control system (e.g. diff's/pull requests) > B) archive files that have a well defined structure (e.g. [1]) > > Questions: > > - Will a Stratos 'committer' ever need to 'create' or 'apply' patches > of type B? > - Will a Stratos 'user' ever need to 'apply' patches of type B? > > > [1]https://wso2.org/jira/browse/DOCUMENTATION-561 > > @Chris: I resolved the JIRA since the content is added to the docs. > > I suggest we can use this mail thread to clear out further doubts. > > > > On Thu, Jun 26, 2014 at 8:43 PM, Praneesha Chandrasiri <pranee...@wso2.com > > wrote: > >> Hi Chris, >> >> Can we resolve this JIRA now? >> >> >> On Thu, Jun 26, 2014 at 8:40 PM, Praneesha Chandrasiri < >> pranee...@wso2.com> wrote: >> >>> Thanks a lot Udara! >>> >>> >>> On Thu, Jun 26, 2014 at 5:30 PM, Udara Liyanage <ud...@wso2.com> wrote: >>> >>>> >>>> >>>> >>>> On Thu, Jun 26, 2014 at 1:37 PM, Praneesha Chandrasiri < >>>> pranee...@wso2.com> wrote: >>>> >>>>> Hi devs, >>>>> >>>>> Shall we provide answers to the following doubts mentioned by Chris in >>>>> [1]? >>>>> >>>>> 1) Patches will need to be applied by both committers and >>>>> non-committers? >>>>> >>>> >>>> Contributers who are not yet commiters can send patches which are >>>> applied by commiters. A non commiter can not apply a patch since he can >>>> not commit. >>>> >>>>> >>>>> 2) Are there different sorts of patches? >>>>> >>>> Can send a source patch (git diff or git format-patch) or a pull >>>> request >>>> >>>>> >>>>> a) git diff patches containing source code changes (created as >>>>> described in step 3 here [1]) >>>>> b) structured archive files containing meta data and code changes >>>>> (created as described here [2]) >>>>> >>>> >>>> >>>>> >>>>> 3) Are there different reasons for a patch based on above? >>>>> a) applying a third parties code changes to your own development tree >>>>> b) applying pre-built packages containing binary files (e.g. jar >>>>> files) to a stratos instance without having to touch source code >>>>> >>>> Stratos team might not provide binary patches. But someone can apply >>>> the source patch, re build the patched code and get the binaries (Jars). >>>> The he can apply the jars to the Stratos as a binary patch. >>>> Create a folder with a patch number like patch10 >>>> Put the patched jars inside the patch10 >>>> copy the folder to the $STRATOS/repository/components/patches >>>> Start Stratos again. >>>> >>>> If any change is done to components/restendpoint/ then stratos.war >>>> should be patched >>>> >>>> rm repository/deployment/web-apps/stratos >>>> rm repository/deployment/web-apps/stratos.war >>>> cp stratos.war repository/deployment/web-apps >>>> >>>>> >>>>> 4) Will the Stratos team be providing patches for released versions of >>>>> Stratos (e.g. security fixes)? >>>>> >>>> 5) If the Stratos team will be providing patches, where can those >>>>> patches be found? >>>>> >>>> Issues will be fixed in the current working branches. I am afraid >>>> released versions will be fixed. However anyone can backport a change to a >>>> released version when it is fixed in master or current working branch. >>>> >>>>> >>>>> >>>>> This is regarding the page added on the patch application in [2]. >>>>> >>>>> [1]https://issues.apache.org/jira/browse/STRATOS-679 >>>>> [2] >>>>> https://cwiki.apache.org/confluence/display/STRATOS/Patch+Application+Process >>>>> >>>>> -- >>>>> Thanks & Best Regards, >>>>> *Praneesha Chandrasiri* >>>>> *Technical Writer* >>>>> *WSO2 Inc. * >>>>> *Mobile: +(94) 718156888 <%2B%2894%29%20718156888>* >>>>> *E-mail: pranee...@wso2.com <pranee...@wso2.com>* >>>>> >>>>> >>>> >>>> >>>> -- >>>> >>>> Udara Liyanage >>>> Software Engineer >>>> WSO2, Inc.: http://wso2.com >>>> lean. enterprise. middleware >>>> >>>> web: http://udaraliyanage.wordpress.com >>>> phone: +94 71 443 6897 >>>> >>> >>> >>> >>> -- >>> Thanks & Best Regards, >>> *Praneesha Chandrasiri* >>> *Technical Writer* >>> *WSO2 Inc. * >>> *Mobile: +(94) 718156888 <%2B%2894%29%20718156888>* >>> *E-mail: pranee...@wso2.com <pranee...@wso2.com>* >>> >>> >> >> >> -- >> Thanks & Best Regards, >> *Praneesha Chandrasiri* >> *Technical Writer* >> *WSO2 Inc. * >> *Mobile: +(94) 718156888 <%2B%2894%29%20718156888>* >> *E-mail: pranee...@wso2.com <pranee...@wso2.com>* >> >> > > > -- > Thanks & Best Regards, > *Praneesha Chandrasiri* > *Technical Writer* > *WSO2 Inc. * > *Mobile: +(94) 718156888 <%2B%2894%29%20718156888>* > *E-mail: pranee...@wso2.com <pranee...@wso2.com>* > > -- Udara Liyanage Software Engineer WSO2, Inc.: http://wso2.com lean. enterprise. middleware web: http://udaraliyanage.wordpress.com phone: +94 71 443 6897
