On Fri, Dec 9, 2011 at 9:12 PM, Asela Pathberiya <[email protected]> wrote:
> Hi Senaka, > > I went through, both 3.2.2 and 3.2.3 branches and added the commits that > were missed in 3.2.3 branch. > > The problem is some one who needed to create the 3.2.3 branch, has been > created with the old revision of 3.2.2 branch. Therefore some fixes are not > in the 3.2.3 branch. Therefore proper way to fix this is, > > 1. Delete the existing 3.2.3 branch which has been created with wrong > revision. > > 2. Create a new 3.2.3 branch from correct release revision of 3.2.2 > > 3. Commit fixes to 3.2.3 > > Sorry, Hasini or I were not able to do this yesterday, as we have not any > fixes that has been commit in to the 3.2.3 branch already. The best person > is to fix this who has committed in to the 3.2.3 branch. > Thanks Asela for clearly explaining the issue here. And +1, in scenarios like branching individual components, it is always easy if the person who creates/commits to that particular version of the component could make sure that it is synced & properly integrated into product builds. (which we have been following in minor releases) I think the two versions are in sync now. Thanks, Hasini. > > However I hope, now it is fixed :) > > Thanks, > Asela. > > On Sat, Dec 10, 2011 at 9:39 AM, Senaka Fernando <[email protected]> wrote: > >> Hi Asela, Hasini, >> >> What's the status of this? >> >> Thanks, >> Senaka. >> >> On Fri, Dec 9, 2011 at 1:53 PM, Senaka Fernando <[email protected]> wrote: >> >>> Hi again, >>> >>> So here is the summary. We have changes to caching core that was >>> introduced after 3.2.2. But, we also have some issues with regard to some >>> fixes that were done in 3.2.2 not appearing in 3.2.3. So, can we first of >>> all, review the difference below and decide whether 3.2.3 is up-to-date and >>> if not fix that? After that's done, we need to include 3.2.3 into the build >>> so that products will have it. >>> >>> Thanks, >>> Senaka. >>> >>> >>> On Fri, Dec 9, 2011 at 1:35 PM, Senaka Fernando <[email protected]> wrote: >>> >>>> Hi Asela, >>>> >>>> But there are differences in 3.2.2 and 3.2.3. How did that happen? >>>> Also, somethings have been added to 3.2.3 which means we need to use 3.2.3 >>>> and not 3.2.2. >>>> >>>> +++++++++++++++++++++++++++++++++++ >>>> $ diff -r 3.2.3 3.2.2 >>>> diff -r >>>> 3.2.3/src/main/java/org/wso2/carbon/caching/core/identity/IdentityCacheEntry.java >>>> 3.2.2/src/main/java/org/wso2/carbon/caching/core/identity/IdentityCacheEntry.java >>>> 32a33 >>>> > private String[] cacheEntryArray; >>>> 54a56,59 >>>> > public IdentityCacheEntry(String[] cacheEntryArray) { >>>> > this.cacheEntryArray = cacheEntryArray; >>>> > } >>>> > >>>> 77a83,86 >>>> > >>>> > public String[] getCacheEntryArray() { >>>> > return cacheEntryArray; >>>> > } >>>> diff -r >>>> 3.2.3/src/main/java/org/wso2/carbon/caching/infinispan/InfinispanCacheManager.java >>>> 3.2.2/src/main/java/org/wso2/carbon/caching/infinispan/InfinispanCacheManager.java >>>> 88,98d87 >>>> < >>>> < >>>> < String tcpConfigFile = >>>> cacheConfiguration.getProperty("configuration.tcp.configFile"); >>>> < if (tcpConfigFile != null) { >>>> < Properties props = new Properties(); >>>> < props.setProperty("configurationFile", >>>> tcpConfigFile.replace("${carbon.home}", >>>> < carbonHome)); >>>> < log.debug("Setting infinispan tcp configuration file"); >>>> < globalConfiguration.setTransportProperties(props); >>>> < } >>>> < >>>> 171d159 >>>> < configuration.setUseLockStriping(false); >>>> +++++++++++++++++++++++++++++++++++ >>>> >>>> Thanks, >>>> Senaka. >>>> >>>> >>>> On Fri, Dec 9, 2011 at 12:46 PM, Hasini Gunasinghe <[email protected]>wrote: >>>> >>>>> >>>>> >>>>> On Fri, Dec 9, 2011 at 12:30 PM, Asela Pathberiya <[email protected]>wrote: >>>>> >>>>>> >>>>>> >>>>>> On Fri, Dec 9, 2011 at 11:57 AM, Senaka Fernando <[email protected]>wrote: >>>>>> >>>>>>> Hi Asela, >>>>>>> >>>>>>> I see that 3.2.2 version of >>>>>>> src/main/java/org/wso2/carbon/caching/core/identity/IdentityCacheEntry.java >>>>>>> have differences over the 3.2.3 version. Can you sort these out and also >>>>>>> add the 3.2.3 version of caching.core into the mainstream build? >>>>>>> >>>>>> >>>>>> I am sorry. IdentityCacheEntry class has not been changed after Oct >>>>>> 17 (before the 3.2.2 release). Identity components are >>>>>> still referring to the 3.2.2 caching core. May be 3.2.3 caching core has >>>>>> been created before 3.2.2 release or old revision. >>>>>> >>>>>> +1, it is an issue with 3.2.3 version, not with 3.2.2 version. >>>>> >>>>> Thanks, >>>>> Hasini. >>>>> >>>>> Thanks, >>>>>> Asela. >>>>>> >>>>>> >>>>>>> >>>>>>> Thanks, >>>>>>> Senaka. >>>>>>> >>>>>>> >>>>>>> On Fri, Dec 9, 2011 at 11:49 AM, Hasini Gunasinghe >>>>>>> <[email protected]>wrote: >>>>>>> >>>>>>>> Hi, >>>>>>>> >>>>>>>> In 3.2.3 branch, there is caching.core 3.2.3 version. >>>>>>>> I see two issues with that: >>>>>>>> 1. It is not included in latest product packs at [1], >>>>>>>> 2. Seems like it is not a latest copy of 3.2.2 release.. so some >>>>>>>> of the commits that has gone to 3.2.2 are not in 3.2.3 component of it. >>>>>>>> >>>>>>>> I think this also should be fixed before the code freeze. Would be >>>>>>>> great if some one who has been working with caching.core 3.2.3 >>>>>>>> component >>>>>>>> can please look into it. >>>>>>>> >>>>>>>> [1] >>>>>>>> http://builder1.us1.wso2.org/~carbon320/releases/carbon/3.2.3/2011-12-07_05-46-09/ >>>>>>>> >>>>>>>> Thanks, >>>>>>>> Hasini. >>>>>>>> >>>>>>>> On Fri, Dec 9, 2011 at 11:00 AM, Sumedha Rubasinghe < >>>>>>>> [email protected]> wrote: >>>>>>>> >>>>>>>>> G-Reg is having 8 blockers still. Senaka will reply on the >>>>>>>>> possibility of completion. >>>>>>>>> /sumedha >>>>>>>>> >>>>>>>>> >>>>>>>>> On Fri, Dec 9, 2011 at 10:26 AM, Prabath Siriwardena < >>>>>>>>> [email protected]> wrote: >>>>>>>>> >>>>>>>>>> Hi folks, >>>>>>>>>> >>>>>>>>>> Carbon 3.2.3 branch will be frozen at 6 PM IST today.... >>>>>>>>>> >>>>>>>>>> -- >>>>>>>>>> Thanks & Regards, >>>>>>>>>> Prabath >>>>>>>>>> >>>>>>>>>> http://blog.facilelogin.com >>>>>>>>>> http://RampartFAQ.com <http://rampartfaq.com/> >>>>>>>>>> _______________________________________________ >>>>>>>>>> Carbon-dev mailing list >>>>>>>>>> [email protected] >>>>>>>>>> http://mail.wso2.org/cgi-bin/mailman/listinfo/carbon-dev >>>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> _______________________________________________ >>>>>>>>> Carbon-dev mailing list >>>>>>>>> [email protected] >>>>>>>>> http://mail.wso2.org/cgi-bin/mailman/listinfo/carbon-dev >>>>>>>>> >>>>>>>>> >>>>>>>> >>>>>>>> _______________________________________________ >>>>>>>> Carbon-dev mailing list >>>>>>>> [email protected] >>>>>>>> http://mail.wso2.org/cgi-bin/mailman/listinfo/carbon-dev >>>>>>>> >>>>>>>> >>>>>>> >>>>>>> >>>>>>> -- >>>>>>> *Senaka Fernando* >>>>>>> Product Manager - WSO2 Governance Registry; >>>>>>> Associate Technical Lead; WSO2 Inc.; http://wso2.com* >>>>>>> Member; Apache Software Foundation; http://apache.org >>>>>>> >>>>>>> E-mail: senaka AT wso2.com >>>>>>> **P: +1 408 754 7388; ext: 51736*; *M: +94 77 322 1818 >>>>>>> Linked-In: http://linkedin.com/in/senakafernando >>>>>>> >>>>>>> *Lean . Enterprise . Middleware >>>>>>> >>>>>>> >>>>>> >>>>>> _______________________________________________ >>>>>> Carbon-dev mailing list >>>>>> [email protected] >>>>>> http://mail.wso2.org/cgi-bin/mailman/listinfo/carbon-dev >>>>>> >>>>>> >>>>> >>>> >>>> >>>> -- >>>> *Senaka Fernando* >>>> Product Manager - WSO2 Governance Registry; >>>> Associate Technical Lead; WSO2 Inc.; http://wso2.com* >>>> Member; Apache Software Foundation; http://apache.org >>>> >>>> E-mail: senaka AT wso2.com >>>> **P: +1 408 754 7388; ext: 51736*; *M: +94 77 322 1818 >>>> Linked-In: http://linkedin.com/in/senakafernando >>>> >>>> *Lean . Enterprise . Middleware >>>> >>>> >>> >>> >>> -- >>> *Senaka Fernando* >>> Product Manager - WSO2 Governance Registry; >>> Associate Technical Lead; WSO2 Inc.; http://wso2.com* >>> Member; Apache Software Foundation; http://apache.org >>> >>> E-mail: senaka AT wso2.com >>> **P: +1 408 754 7388; ext: 51736*; *M: +94 77 322 1818 >>> Linked-In: http://linkedin.com/in/senakafernando >>> >>> *Lean . Enterprise . Middleware >>> >>> >> >> >> -- >> *Senaka Fernando* >> Product Manager - WSO2 Governance Registry; >> Associate Technical Lead; WSO2 Inc.; http://wso2.com* >> Member; Apache Software Foundation; http://apache.org >> >> E-mail: senaka AT wso2.com >> **P: +1 408 754 7388; ext: 51736*; *M: +94 77 322 1818 >> Linked-In: http://linkedin.com/in/senakafernando >> >> *Lean . Enterprise . Middleware >> >> >
_______________________________________________ Carbon-dev mailing list [email protected] http://mail.wso2.org/cgi-bin/mailman/listinfo/carbon-dev
