geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Prasad Kashyap" <goyathlay.geron...@gmail.com>
Subject Re: Re-migration to m2 - status and discussion.
Date Fri, 26 May 2006 03:56:22 GMT
Thank you John.

Anita, the asm dependency in axis-builder/pom.xml needs <version>
element. Before you regenerate the patch the next time, can you please
set your svn as per John's instructions in the wiki page ?

Cheers
Prasad

On 5/25/06, John Sisson <jrsisson@gmail.com> wrote:
> I am guessing this is because the svn:eol-style is property is not set
> to native for the pom.xml file and that the patch was originally created
> on a *NIX box?
>
> Can *everyone* please check that you have svn set up as discussed in the
> document :
>
> http://wiki.apache.org/geronimo/GettingSourceCode#head-4cfe1f3516da2bace5dcb5ed105eaed7c7478afb
>
> so that any new files you create will have the correct svn properties.
>
> I can run the script I put together (
> https://svn.apache.org/repos/asf/geronimo/gbuild/trunk/svnpropset.sh
>   ) that fixes the svn properties on existing files if you like.  Let me
> know..
>
> I recommend that you make a backup of any changes you haven't committed
> first just in case.. (as fixing the line endings can result in every
> line in your files being changed, possibly causing merge issues)..
>
> After the svn properties are fixed, the patches may need to be regenerated.
>
> John
>
> Prasad Kashyap wrote:
> > I was able to apply the same patch on linux. Wonder why not on windows ?
> >
> > Cheers
> > Prasad
> >
> > On 5/25/06, Prasad Kashyap <goyathlay.geronimo@gmail.com> wrote:
> >> Anita,
> >>
> >> I'm unable to apply your modules.patch using TortoiseSVN on XP.
> >>
> >> I first get a pop-up which says, "{g_path}/modules/tomcat/pom.xml has
> >> no URL." It then tries to retrieve version 0 of file. That fails and
> >> it says, "patching not possible"
> >>
> >> Am I doing anything wrong here ?
> >>
> >> Cheers
> >> Prasad
> >>
> >> On 5/25/06, anita kulshreshtha <a_kulshre@yahoo.com> wrote:
> >> > inline..
> >> >
> >> > --- Prasad Kashyap <goyathlay.geronimo@gmail.com> wrote:
> >> >
> >> > > Anita, that is okay with me.
> >> > >
> >> > > So we shall continue to use the old JIRA G-851.
> >> > >
> >> > > You now seem to have a uber patch, one each for the modules and
> >> > > configs. This, I believe, will contain the different patches that
we
> >> > > submitted for the individual modules and configs.
> >> > >
> >> > > You may attach those modules.patch and config.patch to the G-851
> >> > > jira.
> >> > > I shall attach a similar uber patch for the applications in the same
> >> > > jira.
> >> >    I will rebuild the patches against the trunk. I am still trying to
> >> > get an m1 build for the trunk.
> >> >
> >> > >
> >> > > The pom.patch from your G-1740 couldn't be applied because the
> >> > > pom.xml
> >> > > had changed in G-2053. Just fyi. You may want to redo that pom.patch
> >> > > or I can submit the changes I made.
> >> >
> >> >      If you have the latest dependency versions, you can submit the
> >> > patch. I only added few o.a.g.modules and and o.a.g.plugins
> >> > dependencies and few missing dependency versions.
> >> >
> >> > Thnaks
> >> > Anita
> >> > >
> >> > > We could go ahead from there on.
> >> > >
> >> > > Thanx
> >> > > Prasad
> >> > >
> >> > > On 5/25/06, anita kulshreshtha <a_kulshre@yahoo.com> wrote:
> >> > > > inline..
> >> > > >
> >> > > > --- Prasad Kashyap <goyathlay.geronimo@gmail.com> wrote:
> >> > > >
> >> > > > > Now that we have a new 1.2 trunk, we can go ahead migrating
the
> >> > > build
> >> > > > > to m2 (again).
> >> > > > >
> >> > > > > A recap:
> >> > > > > ------------
> >> > > > > 1. The build in the old trunk was migrated to m2. It can
be
> >> found
> >> > > > > here
> >> > > > > http://svn.apache.org/viewvc/geronimo/branches/dead-1.2/
> >> > > > >
> >> > > > > 2. The old migration JIRA was under the JIRA G-851.
> >> > > > > http://issues.apache.org/jira/browse/GERONIMO-851
> >> > > > >
> >> > > > > 3. The migration status can be found here
> >> > > > >
> >> > > >
> >> > >
> >> >
> >> http://opensource.atlassian.com/confluence/oss/display/GERONIMO/Migration+Status
> >>
> >> > > > >  - All the modules (with their tests) were successfully
> >> migrated.
> >> > > > >  - All the applications (with their tests) were successfully
> >> > > > > migrated.
> >> > > > >  - I believe some of the configs were migrated (Anita ?).
> >> > > > >  - The deployment and packaging plugins were migrated.
> >> > > >     The configs and plugin patch was never applied, because we
had
> >> > > > decided to wait for the merge.
> >> > > > >
> >> > > > > So now, we should starting porting those changes back again
into
> >> > > the
> >> > > > > new trunk.
> >> > > > >
> >> > > > > Jacek, should we open a new JIRA on the lines on 851 or
> >> should we
> >> > > > > continue to work with 851 ?
> >> > > > >
> >> > > > > Most of the patches with 851 can be re-applied as is
> >> > > >
> >> > > >
> >> > > >  but should be
> >> > > > > only after a careful screening. So continuing the same JIRA
> >> seems
> >> > > > > okay.
> >> > > >     I agree, it will be easier to refer to the old problems
> >> > > encountered
> >> > > > during the migration.
> >> > > >     A lot of dependencies were moved around in 1.1, so the old
> >> > > patches
> >> > > > to 851 are not likely to work as is. I had transported all the
> >> > > modules
> >> > > > from 1.2 to 1.1. I did lot of dependency pruning after that.
I
> >> > > needed
> >> > > > most of the modules to test the plugin. If it is ok with you,
I
> >> > > would
> >> > > > like to submit a patch for that. I think the applications should
> >> > > work
> >> > > > as is.
> >> > > >
> >> > > > Thanks
> >> > > > Anita
> >> > > >
> >> > > > >
> >> > > > > OTH, we  may want to start afresh with a clean slate and
not add
> >> > > to
> >> > > > > the clutter of the old JIRA. In this case, we will have
to
> >> > > reattach
> >> > > > > the latest patches from the old JIRA to the new JIRA.
> >> > > > >
> >> > > > > I am okay either which way.
> >> > > > >
> >> > > > > Cheers
> >> > > > > Prasad.
> >> > > > >
> >> > > >
> >> > > >
> >> > > > __________________________________________________
> >> > > > Do You Yahoo!?
> >> > > > Tired of spam?  Yahoo! Mail has the best spam protection around
> >> > > > http://mail.yahoo.com
> >> > > >
> >> > >
> >> >
> >> >
> >> > __________________________________________________
> >> > Do You Yahoo!?
> >> > Tired of spam?  Yahoo! Mail has the best spam protection around
> >> > http://mail.yahoo.com
> >> >
> >>
> >
>
>

Mime
View raw message