Revision #718858 now have the merged code (equinox branch + 1.x delta) The original trunk modules was copied to : sca/contrib/modules The current trunk modules represents the merged code -> sca/modules
Details of the merge is available at http://people.apache.org/~lresende/tuscany/sca-equinox/sca-equinox-effective-merging-from-trunk.txt We now need to work on the bring up of the code and resolve existing compilation errors. On Tue, Nov 18, 2008 at 2:45 PM, Raymond Feng <[EMAIL PROTECTED]> wrote: > Hi, > > I have converted the wiki page into a table and added description for > the diffs to explain why we made such changes. > > http://cwiki.apache.org/confluence/display/TUSCANYWIKI/Equinox+Branch+Merge > > Thanks, > Raymond > From: Simon Laws > Sent: Tuesday, November 18, 2008 12:42 PM > To: [email protected] > Subject: Re: Review and merge of trunk and equinox branch changes, was - Re: > [PROPOSAL] A staged approach to create the OASIS development stream in trunk > > > On Tue, Nov 18, 2008 at 7:09 PM, Raymond Feng <[EMAIL PROTECTED]> wrote: >> >> Please see my comments below. >> >> Thanks, >> Raymond >> >> From: Simon Laws >> Sent: Tuesday, November 18, 2008 10:36 AM >> To: [email protected] >> Subject: Re: Review and merge of trunk and equinox branch changes, was - >> Re: [PROPOSAL] A staged approach to create the OASIS development stream in >> trunk >> >> >> >> >> >> On Tue, Nov 18, 2008 at 4:37 PM, Raymond Feng <[EMAIL PROTECTED]> wrote: >> >> Nice summary of the differences. I suggest that we add this list to a wiki >> page to track the merging efforts. I can start to comment on the individual >> modules on the wiki as soon as it appears. >> >> Thanks, >> Raymond >> >> ...snip >> >> Ok Raymond I can do that. I'd like to keep as much of the conversation and >> progress statements on the list but I don't mind summarizing on the wiki and >> then repeating the summary info here for all to see. I'll make a page and >> post again. >> >> <rfeng>Thanks. The main purpose for the suggested wiki page is to track >> progress of the merge in a collaborative way.</rfeng> >> >> More generally the merge looks doable to me. Although I do want to >> understand the more complex modules that I've mentioned. So we could start >> by clearing the modules that are already in trunk/modules to >> /contrib/modules as has already been mentioned and bring back in the minimum >> 40ish modules (combining the changes from the equinox branch with the >> current state of trunk) until we get the calculator-equinox working. >> >> +1. >> >> If I understand correctly the people who've been working on the equinox >> branch are using new tooling modules also so any that are required will have >> to be added in (I haven't tried any of the Eclipse integration in the branch >> I just ran the mvn build, hence my comments on my previous post). It would >> be good to get a description about what any new modules are individually >> responsible for also so that I can tie their function to the features on >> your OSGi enablement page >> (http://cwiki.apache.org/confluence/display/TUSCANYWIKI/OSGi+Enablement+for+Tuscany+Runtime). >> >> <rfeng>I can add some description of the tools to the wiki</rfeng> >> >> Would also be good to get a tutorial of how you use Eclipse in this >> context, e.g. precisely what steps do you go through to configure, load, >> edit and debug modules. Having said that I'm not ready to look at that just >> yet so not an emergeny. I anticipate that I can just carry on using the >> development approach I'm familiar with from the existing trunk while looking >> at the calcualtor-equinox bring up. >> >> I think as we move forward it would be good to move samples and itests to >> contrib also so that we have a clear view of what works. Thoughts? >> >> <rfeng>+1. I would like to merge and bring up some of the samples and >> itests over time along with the process for the modules.</rfeng> >> >> I can start to look at doing some of the merging. Is there anyone who can >> help out? >> >> Simon > > Ok, I put the summary text up on a wiki page > (http://cwiki.apache.org/confluence/display/TUSCANYWIKI/Equinox+Branch+Merge). > No special formatting and in alphabetical order so you may need to refer > back tho this thread to find the ones I had specific questions. > > Simon > -- Luciano Resende Apache Tuscany, Apache PhotArk http://people.apache.org/~lresende http://lresende.blogspot.com/
