> I also did the same for some other stuff I had committed
> to branch_2_1_fcs: they are now ok also in trunk.
OK. I'll update my checked out copy tonight. I have four copies right now:
the old v2 CVS and MAIN trunks, where I had done much of the work for merging,
and the current (unchanged) SVN, along with a batch file for doing the merger.
> there is still something not compiling in trunk, because some
> classes seem to be missing.
Damn ... I had it compiling before, so I'll see if I can figure out what is
wrong.
> I browsed here and there comparing trunk and branch_2_1_fcs,
> and I think that there are a *lot* of things missing.
Hence the lines in my merger script that copy over the new mailing list
manager, improved virtual user tables, etc.
> org.apache.james.transport.mailets.DnsBounce
Hmmm ... not in my script. Post-dates the earlier work. Thanks.
> functionally (?) different:
> org.apache.james.transport.matchers.GenericRegexMatcher
> org.apache.james.transport.matchers.InSpammerBlacklist
> org.apache.james.transport.matchers.RecipientIsRegex
> org.apache.james.transport.matchers.SenderInFakeDomain
> org.apache.james.transport.matchers.SenderIsRegex
Will add.
> branch_2_1_fcs as is should evolve into James next major version.
I'll reconsider how I'm doing the merger. It might be easier to simply re-do
the Avalon work. Especially with the improvements in SVN over CVS.
--- Noel
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
