Re: SVN Merge

2012-01-10 Thread Tom Hobbs
Let SVN do the merge, your changes might be extensive but I doubt there has been much movement in those files since you checked them out. So the merge will probably be more of a replace. I'm hoping to get some coding done in the next few weeks - at last! So we might have enough changes soon for a

Re: SVN Merge

2012-01-10 Thread Dan Creswell
Agreed, remember --dry-run will give you a preview of what's to come in a merge if you have concerns... On 10 January 2012 10:08, Tom Hobbs wrote: > Let SVN do the merge, your changes might be extensive but I doubt there has > been much movement in those files since you checked them out.  So the

Re: SVN Merge

2012-01-10 Thread Peter Firmstone
Tom & Dan, thanks for the support, we're probably looking at a dry run by the weekend, right now I'm running the tests again, this run is expected to pass, I'm just checking for any regressions (same code in svn). I'll clean out all the redundant code, followed by some refactoring to move new

Re: SVN Merge

2012-01-10 Thread Tom Hobbs
I can try and find some time for you. Let me know what you need and I'll do my best. Sent via mobile device, please forgive typos and spacing errors. On 10 Jan 2012 12:17, "Peter Firmstone" wrote: > Tom & Dan, thanks for the support, we're probably looking at a dry run by > the weekend, right

Re: SVN Merge

2012-01-10 Thread Simon IJskes - QCG
On 10-01-12 12:54, Peter Firmstone wrote: Tom & Dan, thanks for the support, we're probably looking at a dry run by the weekend, right now I'm running the tests again, this run is expected to pass, I'm just checking for any regressions (same code in svn). I'll clean out all the redundant code, fo

Re: SVN Merge

2012-01-10 Thread Greg Trasuk
On Tue, 2012-01-10 at 01:24, Peter wrote: > The new security manager and policies are almost ready to merge back into > trunk. > > Any svn merge tips would be much appreciated. > > First, I'd like to move some policy implementation classes that are at > present public in org.apache.river.*, in

Removing the need for config files

2012-01-10 Thread Tom Hobbs
Hey dudes, I'm currently working (read: hacking) my way through the code trying to work out how to make it possible to remove the need for starting services with config files. I remember a user asking about this a while back, but their problem isn't the problem I'm trying to solve right now. I'v

Re: SVN Merge

2012-01-10 Thread Peter Firmstone
Looks like I've had some regressions. These tests were passing yesterday, so it must have something to do with some very recent changes, something to do with null CodeSource in ProtectionDomain's, I suspect. Regards, Peter. com/sun/jini/test/impl/start/ActivateWrapperActivateDescTest.td

Re: Removing the need for config files

2012-01-10 Thread Gregg Wonderly
Did you try EmptyConfiguration.INSTANCE? Gregg Sent from my iPhone On Jan 10, 2012, at 4:04 PM, Tom Hobbs wrote: > Hey dudes, > > I'm currently working (read: hacking) my way through the code trying > to work out how to make it possible to remove the need for starting > services with config f

Re: SVN Merge

2012-01-10 Thread Peter Firmstone
Greg Trasuk wrote: On Tue, 2012-01-10 at 01:24, Peter wrote: The new security manager and policies are almost ready to merge back into trunk. Any svn merge tips would be much appreciated. First, I'd like to move some policy implementation classes that are at present public in org.apache.ri

Re: SVN Merge

2012-01-10 Thread Peter Firmstone
Simon IJskes - QCG wrote: On 10-01-12 12:54, Peter Firmstone wrote: Tom & Dan, thanks for the support, we're probably looking at a dry run by the weekend, right now I'm running the tests again, this run is expected to pass, I'm just checking for any regressions (same code in svn). I'll clean out

Re: SVN Merge

2012-01-10 Thread Peter Firmstone
Having a look at any new interfaces, once we publish them we're stuck with them, so any thoughts or questions (Do I need to improved docs etc) would be appreciated. Regards, Peter. Tom Hobbs wrote: I can try and find some time for you. Let me know what you need and I'll do my best. Sent vi

Re: Removing the need for config files

2012-01-10 Thread Greg Trasuk
On Tue, 2012-01-10 at 17:04, Tom Hobbs wrote: > Hey dudes, > > I'm currently working (read: hacking) my way through the code trying > to work out how to make it possible to remove the need for starting > services with config files. I remember a user asking about this a > while back, but their pr

Re: Removing the need for config files

2012-01-10 Thread Peter Firmstone
You could try Dennis Reedy's Groovy Configuration Provider, that'll give you Pojo's with Java like syntax. We still need to add an ant task to generate the groovy javadoc too. It would be nice to see that system used by default. Cheers, Peter. Greg Trasuk wrote: On Tue, 2012-01-10 at 17:0