Java code contribution committed

[Jeremy Boynes <jb...@apache.org>]

I committed the Java implementation covered by the joint CCLA under
contrib/java as a staging area before moving it under the main java root.

Should we do the move now and start work in the new tree or leave it
where it is until we have had a chance to apply patches for changes made
over the break?

--
Jeremy

Re: Java code contribution committed

[Jean-Sebastien Delfino <js...@apache.org>]

Yes I think it's the right to do. You still have a little bit of time to 
do this. It's going to take us at least one more day to merge the 
changes made over the break (unless Jim who's got the most changes can 
finish his merge today). I'd like to see a successful build and test of 
the merged code before moving it out of contrib.

Pete Robbins wrote:
> So does anyone else have any opinion on whether we should move the cpp and
> java folder structures under a tuscany/trunk ?
>
> Now would be a good time to do this (before the java code is merged across
> from the contrib folder). I'm happy to move the cpp folder if that's what we
> want.
>
> I think this is the right thing to do.
>
> Pete
>
> On 06/01/06, Pete Robbins <ro...@googlemail.com> wrote:
>   
>> Having trunk and branches folders seems to be the most common layout
>> across other projects.
>>
>> Pete
>>
>>
>>
>>     
>
>   

-- 
Jean-Sebastien Delfino

Re: Java code contribution committed

[Pete Robbins <ro...@googlemail.com>]

So does anyone else have any opinion on whether we should move the cpp and
java folder structures under a tuscany/trunk ?

Now would be a good time to do this (before the java code is merged across
from the contrib folder). I'm happy to move the cpp folder if that's what we
want.

I think this is the right thing to do.

Pete

On 06/01/06, Pete Robbins <ro...@googlemail.com> wrote:
>
> Having trunk and branches folders seems to be the most common layout
> across other projects.
>
> Pete
>
>
>

Re: Java code contribution committed

[Pete Robbins <ro...@googlemail.com>]

Having trunk and branches folders seems to be the most common layout across
other projects.

Pete

Re: Java code contribution committed

[Jean-Sebastien Delfino <js...@gmail.com>]

Here's what I propose:

1. Merge the changes made over the break with the tree under contrib. The
structure under contrib is the same as what we had under trunk in our
previous repository, so a simple "svn diff" between the trees should help
bring things up to date. We may have to do some merging but there are not so
many changes so maybe we could all do that and take care of patching our own
changes? Jim I think you have the most changes, what do you think?

2. When we're done with the merge, copy everything under the new layout.
We'll probably have to adjust a few things to get our build working again. I
volunteer to do that.

BTW I noticed that we don't have a trunk folder in the new layout... instead
java and cpp are at the top level under tuscany. Shouldn't we move java and
cpp under a trunk folder? any opinions?

--
Jean-Sebastien

On 1/5/06, Edward Slattery <ed...@googlemail.com> wrote:
>
> We added the C++ code this morning directly in the cpp area, and have
> stacked up the changes made over the break so that we can apply them now.
> We
> will begin to do that tomorrow.
>
> Ed.
>
>
> On 05/01/06, Jeremy Boynes <jb...@apache.org> wrote:
> >
> > I committed the Java implementation covered by the joint CCLA under
> > contrib/java as a staging area before moving it under the main java
> root.
> >
> > Should we do the move now and start work in the new tree or leave it
> > where it is until we have had a chance to apply patches for changes made
> > over the break?
> >
> > --
> > Jeremy
> >
>
>


--
Jean-Sebastien

Re: Java code contribution committed

[Edward Slattery <ed...@googlemail.com>]

We added the C++ code this morning directly in the cpp area, and have
stacked up the changes made over the break so that we can apply them now. We
will begin to do that tomorrow.

Ed.


On 05/01/06, Jeremy Boynes <jb...@apache.org> wrote:
>
> I committed the Java implementation covered by the joint CCLA under
> contrib/java as a staging area before moving it under the main java root.
>
> Should we do the move now and start work in the new tree or leave it
> where it is until we have had a chance to apply patches for changes made
> over the break?
>
> --
> Jeremy
>