On 9/21/07, Ignacio Silva-Lepe <[EMAIL PROTECTED]> wrote: > > Hi Simon, > > I compared > > (1) HEAD/sca/modules/implementation-notification with > > https://svn.apache.org/repos/asf/incubator/tuscany/branches/sca-java-1.0/modules/implementation-notification > > and > > (2) HEAD/sca/modules/binding-notification with > > https://svn.apache.org/repos/asf/incubator/tuscany/branches/sca-java-1.0/modules/binding-notification > > and the only differences were in the respective poms, where " > 1.0-incubating-SNAPSHOT" > in the branch was "1.1-incubating-SNAPSHOT" in HEAD, which I think is ok > since the > head has been bumped up to the next level. > > As for the samples, the differences (in addition to the poms as above) are > only related > to the addition of the ant build scripts in HEAD, which did not make it to > the branch. > These differences include build.xml, README, the main class in src/main, > and > the > resources, in the four samples. > I am not sure if we want/are able to add these differences to the branch > at > this point, but HEAD is most up to date to keep working with. > > Thanks > > > On 9/20/07, Simon Laws <[EMAIL PROTECTED]> wrote: > > > > On 9/20/07, Ignacio Silva-Lepe <[EMAIL PROTECTED]> wrote: > > > > > > Ok, I updated to r577913, built implementation-notification and > > > binding-notification, and the samples. Everything looks ok. > > > > > > Did you also want me to cross check with the branch, or just > > > check the trunk? > > > > > > > > > On 9/20/07, Simon Laws <[EMAIL PROTECTED]> wrote: > > > > > > > > On 9/20/07, Luciano Resende <[EMAIL PROTECTED] > wrote: > > > > > > > > > > The BPEL related projects are already merged. They have some > > > > > differences as trunk has been evolving. > > > > > > > > > > On 9/20/07, Simon Laws < [EMAIL PROTECTED]> wrote: > > > > > > On 9/20/07, Raymond Feng <[EMAIL PROTECTED]> wrote: > > > > > > > > > > > > > > Thank you for volunteering. That would be great that we do in > a > > > > batch. > > > > > > > > > > > > Please note some of the changes may have already been merged > not > > > by > > > > > the > > > > > > > check-in sequence. > > > > > > > > > > > > > > Thanks, > > > > > > > Raymond > > > > > > > > > > > > > > ----- Original Message ----- > > > > > > > From: "Simon Laws" < [EMAIL PROTECTED]> > > > > > > > To: "tuscany-dev" <[email protected] > > > > > > > > Sent: Thursday, September 20, 2007 1:58 AM > > > > > > > Subject: Merging branch changes back into truck > > > > > > > > > > > > > > > > > > > > > > There are quite a few changes in the branch that are not in > > the > > > > > trunk. > > > > > > > > http://people.apache.org/~slaws/Report.html > > > > > <http://people.apache.org/%7Eslaws/Report.html> - anything blue or > > red > > > > on > > > > > > > the > > > > > > > > right hand side means there is something. I'm just sorting > out > > > the > > > > > > > > domain/node changes. Most others are small things, poms etc. > > > > > > > > > > > > > > > > Let me know if you want me to do a general sweep. > > > > > > > > > > > > > > > > Simon > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > --------------------------------------------------------------------- > > > > > > > To unsubscribe, e-mail: [EMAIL PROTECTED] > > > > > > > For additional commands, e-mail: > [EMAIL PROTECTED] > > > > > > > > > > > > > > Ok, I've done the domain/node changes and the tuscany-sca-spi > > > > changes > > > > > > > > > > > > Let me take a look at the others then. I'll shout if I get stuck > > > > > > > > > > > > Simon > > > > > > > > > > > > > > > > > > > > > -- > > > > > Luciano Resende > > > > > Apache Tuscany Committer > > > > > http://people.apache.org/~lresende < > > > http://people.apache.org/%7Elresende > > > > > > > > > > http://lresende.blogspot.com/ > > > > > > > > > > > > --------------------------------------------------------------------- > > > > > To unsubscribe, e-mail: [EMAIL PROTECTED] > > > > > For additional commands, e-mail: [EMAIL PROTECTED] > > > > > > > > > > Ok, I've done the merge from the branch into the trunk. Areas > where > > > it's > > > > unclear whether the head or the branch is correct. > > > > > > > > binding-notification-* > > > > implementation-notification > > > > > > > > Ignacio if you can take a look that would be great. > > > > > > > > It builds/test on my machine but I still have a bpel problem which I > > > need > > > > to > > > > double check > > > > > > > > I'm driving from the office to home now so if people could give it a > > > spin > > > > in > > > > the mean time that would be great > > > > > > > > Thanks > > > > > > > > Simon > > > > > > > > > Hi Ignacio > > > > Can you cross check with the branch for me. There we some things that I > > wasn't sure about. > > > > Thanks > > > > Simon > > > Great, thanks for doing this Ignacio
Ant has asked that we follow a review then commit model with the V1.0 branch now so that if we decide we want to get those changes into the branch the thing to do is raise a JIRA targetting Java SCA 1.0.1 and attach a patch for the changes as applied to the branch. Simon
