You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cayenne.apache.org by Bill Dudney <bd...@apache.org> on 2006/07/26 14:07:35 UTC
mvn move of main code
HI All,
The move to a maven directory layout is going to be disruptive and I
wanted to get everyone's take on how to handle it.
for example;
main/cayenne/cayenne-java/lib - to be removed
main/cayenne/cayenne-java/lib-src - to be removed
main/cayenne/cayenne-java/src/cayenne - to be moved to ..
main/cayenne/cayenne-java/src/cayenne - to be moved to ..
main/cayenne/cayenne-java/src/dvmodeler - to be moved to ..
main/cayenne/cayenne-java/src/modeler - to be moved to ..
main/cayenne/cayenne-java/src/regression - to be moved to their
respective projects?
main/cayenne/cayenne-java/src/tests - moved into their respective
projects?
Then once all the modules are moved there will be similar moves
within each directory, i.e;
main/cayenne/cayenne-java/cayenne/dtd/*.dtd -> main/cayenne/cayenne-
java/cayenne/src/main/resources
main/cayenne/cayenne-java/cayenne/resources/* -> main/cayenne/cayenne-
java/cayenne/src/main/resources
main/cayenne/cayenne-java/cayenne/java -> main/cayenne/cayenne-java/
cayenne/src/main/java
I'm getting started today and hope to be done by late tomorrow with
the first cut (i.e. a build that gets a jar file into a local repo)
that we can build on.
It would be easiest for me to check things in incrementally (i.e. do
one module at a time and check it in) with everyone understanding
that the build will be hosed for a time. This is probably not the
best way for our users but I wanted to get your take, would it be ok
for the build to be hosed for a couple of days to a week? The other
option of course is to branch but then we have to pull everything up
from the main line into the branch. The Geronimo team went this way
and its working OK but its not fun.
Does anyone have any major outstanding changes that will be hard to
merge as a result of these moves? If so can they be checked in now?
Thoughts?
TTFN,
-bd-
RE: mvn move of main code
Posted by Kevin Menard <km...@servprise.com>.
> -----Original Message-----
> From: Bill Dudney [mailto:bdudney@apache.org]
> Sent: Thursday, July 27, 2006 6:58 PM
> To: cayenne-dev@incubator.apache.org
> Subject: Re: mvn move of main code
>
> Hi Kevin & all,
>
> I've left it for now but will rename all the tests once we get a
> build going again...
Sounds good. It's easy to ask for things when I'm not doing the work :-P
--
Kevin
Re: mvn move of main code
Posted by Bill Dudney <bd...@apache.org>.
Hi Kevin & all,
I've left it for now but will rename all the tests once we get a
build going again...
TTFN,
-bd-
On Jul 27, 2006, at 4:52 PM, Kevin Menard wrote:
>
>
>> -----Original Message-----
>> From: Andrus Adamchik [mailto:andrus@objectstyle.org]
>> Sent: Wednesday, July 26, 2006 9:22 AM
>> To: cayenne-dev@incubator.apache.org
>> Subject: Re: mvn move of main code
>
>> One more change that we might do while we are at it - our current
>> test case classes are using *Tst suffix. Maven (and generally
>> accepted) naming convention is to use *Test. So we might also change
>> those.
>
> +1
>
> The current naming convention has always grated me a little ;-)
>
> --
> Kevin
>
>
RE: mvn move of main code
Posted by Kevin Menard <km...@servprise.com>.
> -----Original Message-----
> From: Andrus Adamchik [mailto:andrus@objectstyle.org]
> Sent: Wednesday, July 26, 2006 9:22 AM
> To: cayenne-dev@incubator.apache.org
> Subject: Re: mvn move of main code
> One more change that we might do while we are at it - our current
> test case classes are using *Tst suffix. Maven (and generally
> accepted) naming convention is to use *Test. So we might also change
> those.
+1
The current naming convention has always grated me a little ;-)
--
Kevin
Re: mvn move of main code
Posted by Andrus Adamchik <an...@objectstyle.org>.
Bill,
Your plan sounds ok to me (personally I'll be working on cayenne-jpa
module at this time, so my work won't even be affected). We expected
some disruption and now is a good time to do it. I am also against
branching.
One more change that we might do while we are at it - our current
test case classes are using *Tst suffix. Maven (and generally
accepted) naming convention is to use *Test. So we might also change
those.
Andrus
On Jul 26, 2006, at 8:07 AM, Bill Dudney wrote:
> HI All,
>
> The move to a maven directory layout is going to be disruptive and
> I wanted to get everyone's take on how to handle it.
>
> for example;
>
> main/cayenne/cayenne-java/lib - to be removed
> main/cayenne/cayenne-java/lib-src - to be removed
> main/cayenne/cayenne-java/src/cayenne - to be moved to ..
> main/cayenne/cayenne-java/src/cayenne - to be moved to ..
> main/cayenne/cayenne-java/src/dvmodeler - to be moved to ..
> main/cayenne/cayenne-java/src/modeler - to be moved to ..
> main/cayenne/cayenne-java/src/regression - to be moved to their
> respective projects?
> main/cayenne/cayenne-java/src/tests - moved into their respective
> projects?
>
> Then once all the modules are moved there will be similar moves
> within each directory, i.e;
>
> main/cayenne/cayenne-java/cayenne/dtd/*.dtd -> main/cayenne/cayenne-
> java/cayenne/src/main/resources
> main/cayenne/cayenne-java/cayenne/resources/* -> main/cayenne/
> cayenne-java/cayenne/src/main/resources
> main/cayenne/cayenne-java/cayenne/java -> main/cayenne/cayenne-java/
> cayenne/src/main/java
>
> I'm getting started today and hope to be done by late tomorrow with
> the first cut (i.e. a build that gets a jar file into a local repo)
> that we can build on.
>
> It would be easiest for me to check things in incrementally (i.e.
> do one module at a time and check it in) with everyone
> understanding that the build will be hosed for a time. This is
> probably not the best way for our users but I wanted to get your
> take, would it be ok for the build to be hosed for a couple of days
> to a week? The other option of course is to branch but then we have
> to pull everything up from the main line into the branch. The
> Geronimo team went this way and its working OK but its not fun.
>
> Does anyone have any major outstanding changes that will be hard to
> merge as a result of these moves? If so can they be checked in now?
>
> Thoughts?
>
> TTFN,
>
> -bd-
>
Re: mvn move of main code
Posted by Bill Dudney <bd...@apache.org>.
OK after a brief chat with Andrus we got things straightned out and
I'll be making the first commit in a moment which will hose the build
for a bit.
I'll post again when its all done.
TTFN,
-bd-
On Jul 27, 2006, at 4:33 PM, Bill Dudney wrote:
> Hi Andrus,
>
> I was just about to commit a bunch of changes to cayenne-java. Is
> now a good time?
>
> TTFN,
>
> -bd-
>
> On Jul 27, 2006, at 12:43 PM, Andrus Adamchik wrote:
>
>> Bill,
>>
>> could you please post a note to the list when you start moving
>> folders around? I started working on some changes related to the
>> pluggable query cache, so I may be checking in the code to cayenne-
>> java.
>>
>> Andrus
>>
>>
>> On Jul 26, 2006, at 8:07 AM, Bill Dudney wrote:
>>
>>> HI All,
>>>
>>> The move to a maven directory layout is going to be disruptive
>>> and I wanted to get everyone's take on how to handle it.
>>>
>>> for example;
>>>
>>> main/cayenne/cayenne-java/lib - to be removed
>>> main/cayenne/cayenne-java/lib-src - to be removed
>>> main/cayenne/cayenne-java/src/cayenne - to be moved to ..
>>> main/cayenne/cayenne-java/src/cayenne - to be moved to ..
>>> main/cayenne/cayenne-java/src/dvmodeler - to be moved to ..
>>> main/cayenne/cayenne-java/src/modeler - to be moved to ..
>>> main/cayenne/cayenne-java/src/regression - to be moved to their
>>> respective projects?
>>> main/cayenne/cayenne-java/src/tests - moved into their respective
>>> projects?
>>>
>>> Then once all the modules are moved there will be similar moves
>>> within each directory, i.e;
>>>
>>> main/cayenne/cayenne-java/cayenne/dtd/*.dtd -> main/cayenne/
>>> cayenne-java/cayenne/src/main/resources
>>> main/cayenne/cayenne-java/cayenne/resources/* -> main/cayenne/
>>> cayenne-java/cayenne/src/main/resources
>>> main/cayenne/cayenne-java/cayenne/java -> main/cayenne/cayenne-
>>> java/cayenne/src/main/java
>>>
>>> I'm getting started today and hope to be done by late tomorrow
>>> with the first cut (i.e. a build that gets a jar file into a
>>> local repo) that we can build on.
>>>
>>> It would be easiest for me to check things in incrementally (i.e.
>>> do one module at a time and check it in) with everyone
>>> understanding that the build will be hosed for a time. This is
>>> probably not the best way for our users but I wanted to get your
>>> take, would it be ok for the build to be hosed for a couple of
>>> days to a week? The other option of course is to branch but then
>>> we have to pull everything up from the main line into the branch.
>>> The Geronimo team went this way and its working OK but its not fun.
>>>
>>> Does anyone have any major outstanding changes that will be hard
>>> to merge as a result of these moves? If so can they be checked in
>>> now?
>>>
>>> Thoughts?
>>>
>>> TTFN,
>>>
>>> -bd-
>>>
>>
>
Re: mvn move of main code
Posted by Bill Dudney <bd...@apache.org>.
Hi Andrus,
I was just about to commit a bunch of changes to cayenne-java. Is now
a good time?
TTFN,
-bd-
On Jul 27, 2006, at 12:43 PM, Andrus Adamchik wrote:
> Bill,
>
> could you please post a note to the list when you start moving
> folders around? I started working on some changes related to the
> pluggable query cache, so I may be checking in the code to cayenne-
> java.
>
> Andrus
>
>
> On Jul 26, 2006, at 8:07 AM, Bill Dudney wrote:
>
>> HI All,
>>
>> The move to a maven directory layout is going to be disruptive and
>> I wanted to get everyone's take on how to handle it.
>>
>> for example;
>>
>> main/cayenne/cayenne-java/lib - to be removed
>> main/cayenne/cayenne-java/lib-src - to be removed
>> main/cayenne/cayenne-java/src/cayenne - to be moved to ..
>> main/cayenne/cayenne-java/src/cayenne - to be moved to ..
>> main/cayenne/cayenne-java/src/dvmodeler - to be moved to ..
>> main/cayenne/cayenne-java/src/modeler - to be moved to ..
>> main/cayenne/cayenne-java/src/regression - to be moved to their
>> respective projects?
>> main/cayenne/cayenne-java/src/tests - moved into their respective
>> projects?
>>
>> Then once all the modules are moved there will be similar moves
>> within each directory, i.e;
>>
>> main/cayenne/cayenne-java/cayenne/dtd/*.dtd -> main/cayenne/
>> cayenne-java/cayenne/src/main/resources
>> main/cayenne/cayenne-java/cayenne/resources/* -> main/cayenne/
>> cayenne-java/cayenne/src/main/resources
>> main/cayenne/cayenne-java/cayenne/java -> main/cayenne/cayenne-
>> java/cayenne/src/main/java
>>
>> I'm getting started today and hope to be done by late tomorrow
>> with the first cut (i.e. a build that gets a jar file into a local
>> repo) that we can build on.
>>
>> It would be easiest for me to check things in incrementally (i.e.
>> do one module at a time and check it in) with everyone
>> understanding that the build will be hosed for a time. This is
>> probably not the best way for our users but I wanted to get your
>> take, would it be ok for the build to be hosed for a couple of
>> days to a week? The other option of course is to branch but then
>> we have to pull everything up from the main line into the branch.
>> The Geronimo team went this way and its working OK but its not fun.
>>
>> Does anyone have any major outstanding changes that will be hard
>> to merge as a result of these moves? If so can they be checked in
>> now?
>>
>> Thoughts?
>>
>> TTFN,
>>
>> -bd-
>>
>
Re: mvn move of main code
Posted by Andrus Adamchik <an...@objectstyle.org>.
Bill,
could you please post a note to the list when you start moving
folders around? I started working on some changes related to the
pluggable query cache, so I may be checking in the code to cayenne-java.
Andrus
On Jul 26, 2006, at 8:07 AM, Bill Dudney wrote:
> HI All,
>
> The move to a maven directory layout is going to be disruptive and
> I wanted to get everyone's take on how to handle it.
>
> for example;
>
> main/cayenne/cayenne-java/lib - to be removed
> main/cayenne/cayenne-java/lib-src - to be removed
> main/cayenne/cayenne-java/src/cayenne - to be moved to ..
> main/cayenne/cayenne-java/src/cayenne - to be moved to ..
> main/cayenne/cayenne-java/src/dvmodeler - to be moved to ..
> main/cayenne/cayenne-java/src/modeler - to be moved to ..
> main/cayenne/cayenne-java/src/regression - to be moved to their
> respective projects?
> main/cayenne/cayenne-java/src/tests - moved into their respective
> projects?
>
> Then once all the modules are moved there will be similar moves
> within each directory, i.e;
>
> main/cayenne/cayenne-java/cayenne/dtd/*.dtd -> main/cayenne/cayenne-
> java/cayenne/src/main/resources
> main/cayenne/cayenne-java/cayenne/resources/* -> main/cayenne/
> cayenne-java/cayenne/src/main/resources
> main/cayenne/cayenne-java/cayenne/java -> main/cayenne/cayenne-java/
> cayenne/src/main/java
>
> I'm getting started today and hope to be done by late tomorrow with
> the first cut (i.e. a build that gets a jar file into a local repo)
> that we can build on.
>
> It would be easiest for me to check things in incrementally (i.e.
> do one module at a time and check it in) with everyone
> understanding that the build will be hosed for a time. This is
> probably not the best way for our users but I wanted to get your
> take, would it be ok for the build to be hosed for a couple of days
> to a week? The other option of course is to branch but then we have
> to pull everything up from the main line into the branch. The
> Geronimo team went this way and its working OK but its not fun.
>
> Does anyone have any major outstanding changes that will be hard to
> merge as a result of these moves? If so can they be checked in now?
>
> Thoughts?
>
> TTFN,
>
> -bd-
>
Re: mvn move of main code
Posted by Mike Kienenberger <mk...@gmail.com>.
On 7/26/06, Andrus Adamchik <an...@objectstyle.org> wrote:
> Cool. Could you provide some details on what needs to be preserved
> and how to handle it via Maven?
I can provide details, but don't know anything about configuring
Maven. I've heard that Maven can run ant tasks, so maybe it's easy.
In src/regression/java,
org.objectstyle.cayenne.regression.AntFileSetCompareTask
In src/tests/resources,
test-resources/ClassGeneration
In the regression.xml file,
All of the properties? (not sure about the ones used in the classpath).
The "testrun.classgeneration" directory can be changed to anywhere.
The agnostic-classpath path.
targets:
testTemplating
compile
check-connection and friends might need to be to be added to the
testTemplating dependency list after compile if the script is changed
by removing testRandomDomainBuilderAndDataModificationRobot. Not
sure really on this. I'm not sure if the embedded database connection
is used for the template testing -- I don't think it is, but the
classpath path id doesn't appear to be defined unless this target is
called.
So you'd need these targets.
use-specified-connection
use-embedded-hsqldb
check-connection
> On Jul 26, 2006, at 1:02 PM, Mike Kienenberger wrote:
>
> > They're definitely integration tests, not unit tests. They basically
> > compare an expected generated output against the output from running
> > the cgen ant task.
> >
> > On 7/26/06, Andrus Adamchik <an...@objectstyle.org> wrote:
> >>
> >> On Jul 26, 2006, at 12:52 PM, Mike Kienenberger wrote:
> >>
> >> >> On Jul 26, 2006, at 8:07 AM, Bill Dudney wrote:
> >> >> > main/cayenne/cayenne-java/src/regression - to be moved to their
> >> >> > respective projects?
> >> >
> >> > On 7/26/06, Andrus Adamchik <an...@objectstyle.org> wrote:
> >> >> I would kill this module all together if there are no objections.
> >>
> >>
> >> > The rest of it is probably garbage, though.
> >>
> >> Not that it's garbage, it is just that we don't use it for a number
> >> of years. For the purpose of Maven migration it is all the same
> >> though, besides the copy of it exists on 1.2 (and other) branches, so
> >> it can be safely removed from HEAD.
> >>
> >>
> >> > There are some cgen regression tests that we should keep.
> >>
> >> Where to you think we can put those in maven? Treat them as unit
> >> tests or integration tests?
> >>
> >> Andrus
> >>
> >
>
>
Re: mvn move of main code
Posted by Andrus Adamchik <an...@objectstyle.org>.
Cool. Could you provide some details on what needs to be preserved
and how to handle it via Maven?
Andrus
On Jul 26, 2006, at 1:02 PM, Mike Kienenberger wrote:
> They're definitely integration tests, not unit tests. They basically
> compare an expected generated output against the output from running
> the cgen ant task.
>
> On 7/26/06, Andrus Adamchik <an...@objectstyle.org> wrote:
>>
>> On Jul 26, 2006, at 12:52 PM, Mike Kienenberger wrote:
>>
>> >> On Jul 26, 2006, at 8:07 AM, Bill Dudney wrote:
>> >> > main/cayenne/cayenne-java/src/regression - to be moved to their
>> >> > respective projects?
>> >
>> > On 7/26/06, Andrus Adamchik <an...@objectstyle.org> wrote:
>> >> I would kill this module all together if there are no objections.
>>
>>
>> > The rest of it is probably garbage, though.
>>
>> Not that it's garbage, it is just that we don't use it for a number
>> of years. For the purpose of Maven migration it is all the same
>> though, besides the copy of it exists on 1.2 (and other) branches, so
>> it can be safely removed from HEAD.
>>
>>
>> > There are some cgen regression tests that we should keep.
>>
>> Where to you think we can put those in maven? Treat them as unit
>> tests or integration tests?
>>
>> Andrus
>>
>
Re: mvn move of main code
Posted by Mike Kienenberger <mk...@gmail.com>.
They're definitely integration tests, not unit tests. They basically
compare an expected generated output against the output from running
the cgen ant task.
On 7/26/06, Andrus Adamchik <an...@objectstyle.org> wrote:
>
> On Jul 26, 2006, at 12:52 PM, Mike Kienenberger wrote:
>
> >> On Jul 26, 2006, at 8:07 AM, Bill Dudney wrote:
> >> > main/cayenne/cayenne-java/src/regression - to be moved to their
> >> > respective projects?
> >
> > On 7/26/06, Andrus Adamchik <an...@objectstyle.org> wrote:
> >> I would kill this module all together if there are no objections.
>
>
> > The rest of it is probably garbage, though.
>
> Not that it's garbage, it is just that we don't use it for a number
> of years. For the purpose of Maven migration it is all the same
> though, besides the copy of it exists on 1.2 (and other) branches, so
> it can be safely removed from HEAD.
>
>
> > There are some cgen regression tests that we should keep.
>
> Where to you think we can put those in maven? Treat them as unit
> tests or integration tests?
>
> Andrus
>
Re: mvn move of main code
Posted by Andrus Adamchik <an...@objectstyle.org>.
On Jul 26, 2006, at 12:52 PM, Mike Kienenberger wrote:
>> On Jul 26, 2006, at 8:07 AM, Bill Dudney wrote:
>> > main/cayenne/cayenne-java/src/regression - to be moved to their
>> > respective projects?
>
> On 7/26/06, Andrus Adamchik <an...@objectstyle.org> wrote:
>> I would kill this module all together if there are no objections.
> The rest of it is probably garbage, though.
Not that it's garbage, it is just that we don't use it for a number
of years. For the purpose of Maven migration it is all the same
though, besides the copy of it exists on 1.2 (and other) branches, so
it can be safely removed from HEAD.
> There are some cgen regression tests that we should keep.
Where to you think we can put those in maven? Treat them as unit
tests or integration tests?
Andrus
Re: mvn move of main code
Posted by Mike Kienenberger <mk...@gmail.com>.
> On Jul 26, 2006, at 8:07 AM, Bill Dudney wrote:
> > main/cayenne/cayenne-java/src/regression - to be moved to their
> > respective projects?
On 7/26/06, Andrus Adamchik <an...@objectstyle.org> wrote:
> I would kill this module all together if there are no objections.
There are some cgen regression tests that we should keep.
The rest of it is probably garbage, though.
Re: mvn move of main code
Posted by Andrus Adamchik <an...@objectstyle.org>.
On Jul 26, 2006, at 8:07 AM, Bill Dudney wrote:
> main/cayenne/cayenne-java/src/regression - to be moved to their
> respective projects?
I would kill this module all together if there are no objections.
> main/cayenne/cayenne-java/src/tests - moved into their respective
> projects?
+1
Andrus