Re: Redeploy on context.xml changes (Was: Tagging 7.0.23)

2011-11-14 Thread Mark Thomas
On 14/11/2011 05:54, Konstantin Kolinko wrote: Note: "Fixed" below means I have fixed the issue locally and will include it in the commit. > 1) s/Redploy/Redeploy/ in several comments. Fixed. > 2) In HostConfig.checkResources() there are three occurrences of the > following code: Fixed. > 3) Te

Re: Redeploy on context.xml changes (Was: Tagging 7.0.23)

2011-11-13 Thread Konstantin Kolinko
2011/11/10 Mark Thomas : > On 08/11/2011 22:49, Mark Thomas wrote: >> I found some time today to look at this. Summarising the issues so far: >> >> 1. I have separately applied a couple of minor fixes that were included >> in the larger patch. >> >> 2. Renaming watchedResources -> reloadResoucres >

Re: Redeploy on context.xml changes (Was: Tagging 7.0.23)

2011-11-10 Thread Mark Thomas
On 08/11/2011 22:49, Mark Thomas wrote: > I found some time today to look at this. Summarising the issues so far: > > 1. I have separately applied a couple of minor fixes that were included > in the larger patch. > > 2. Renaming watchedResources -> reloadResoucres > Agree with reverting this chan

Re: Redeploy on context.xml changes (Was: Tagging 7.0.23)

2011-11-08 Thread Mark Thomas
I found some time today to look at this. Summarising the issues so far: 1. I have separately applied a couple of minor fixes that were included in the larger patch. 2. Renaming watchedResources -> reloadResoucres Agree with reverting this change 3. Adding JavaDoc to FailedContext Agree with doin

Re: Redeploy on context.xml changes (Was: Tagging 7.0.23)

2011-11-07 Thread Konstantin Kolinko
2011/11/6 Konstantin Kolinko : > 2011/11/6 Mark Thomas : >> >> I'm in two minds whether to apply this patch before or after the 7.0.23 >> tag. There are clearly issues here that need fixing but the patch is >> quite invasive. I'm leaning towards tagging after the patch is applied. >> Thoughts? >> >

Re: Redeploy on context.xml changes (Was: Tagging 7.0.23)

2011-11-05 Thread Konstantin Kolinko
2011/11/6 Mark Thomas : > > I'm in two minds whether to apply this patch before or after the 7.0.23 > tag. There are clearly issues here that need fixing but the patch is > quite invasive. I'm leaning towards tagging after the patch is applied. > Thoughts? > In short: I think there are two issues

Re: Redeploy on context.xml changes (Was: Tagging 7.0.23)

2011-11-05 Thread Mark Thomas
On 05/11/2011 15:24, Konstantin Kolinko wrote: > 2011/11/4 Mark Thomas : >> On 03/11/2011 17:08, Mark Thomas wrote: >>> I'm still looking at: >>> - recovery after fixing the broken file >>> - not deploying an expanded dir if the context.xml in >>> conf/Catalina/localhost is broken. >> >> OK. Here i

Re: Redeploy on context.xml changes (Was: Tagging 7.0.23)

2011-11-05 Thread Konstantin Kolinko
2011/11/4 Mark Thomas : > On 03/11/2011 17:08, Mark Thomas wrote: >> I'm still looking at: >> - recovery after fixing the broken file >> - not deploying an expanded dir if the context.xml in >> conf/Catalina/localhost is broken. > > OK. Here is a patch for review. There are so many combinations > d

Re: Redeploy on context.xml changes (Was: Tagging 7.0.23)

2011-11-03 Thread Mark Thomas
On 03/11/2011 17:08, Mark Thomas wrote: > I'm still looking at: > - recovery after fixing the broken file > - not deploying an expanded dir if the context.xml in > conf/Catalina/localhost is broken. OK. Here is a patch for review. There are so many combinations deployment and ways to create a dodg

Re: Redeploy on context.xml changes (Was: Tagging 7.0.23)

2011-11-03 Thread Mark Thomas
On 02/11/2011 15:35, Konstantin Kolinko wrote: > 2011/11/2 : > Also s/redploy/redeploy/ in some Javadoc. Fixed for next iteration of the patch. > The removeWatchedResource() method in the patch is NOOP instead of > calling renamed method. Also fixed. > The following in StandardContext.java does

Redeploy on context.xml changes (Was: Tagging 7.0.23)

2011-11-02 Thread Konstantin Kolinko
2011/11/2 : > Konstantin Kolinko wrote: > >>2011/11/2 Mark Thomas : >>> On 01/11/2011 22:39, Mark Thomas wrote: > >>> My first stab at a patch for this is at [1]. Comments welcome. > >>>http://people.apache.org/~markt/patches/2011-11-01-redeploy-trunk-v1.patch > > >>Quick review - several typos:

Re: Tagging 7.0.23

2011-11-02 Thread markt
Konstantin Kolinko wrote: >2011/11/2 Mark Thomas : >> On 01/11/2011 22:39, Mark Thomas wrote: >> My first stab at a patch for this is at [1]. Comments welcome. >>http://people.apache.org/~markt/patches/2011-11-01-redeploy-trunk-v1.patch >Quick review - several typos: > >mbeans-descriptors.xml

Re: Tagging 7.0.23

2011-11-01 Thread Konstantin Kolinko
2011/11/2 Mark Thomas : > On 01/11/2011 22:39, Mark Thomas wrote: >> Changes to any context.xml have to trigger a redeploy else they won't >> take effect as no new Context object will be created. > > My first stab at a patch for this is at [1]. Comments welcome. > > The one thing I don't like is th

Re: Tagging 7.0.23

2011-11-01 Thread Mark Thomas
On 01/11/2011 22:39, Mark Thomas wrote: > Changes to any context.xml have to trigger a redeploy else they won't > take effect as no new Context object will be created. My first stab at a patch for this is at [1]. Comments welcome. The one thing I don't like is that a change to conf/context.xml th

Re: Tagging 7.0.23

2011-11-01 Thread Mark Thomas
On 01/11/2011 22:31, Konstantin Kolinko wrote: > 2011/11/2 Mark Thomas : >> On 01/11/2011 22:01, Konstantin Kolinko wrote: >>> 2011/11/2 Konstantin Kolinko : 2011/11/1 Mark Thomas : > My current thinking is to add redeployResoucre and reloadResource to > Context and deprecate watchedRe

Re: Tagging 7.0.23

2011-11-01 Thread Konstantin Kolinko
2011/11/2 Mark Thomas : > On 01/11/2011 22:01, Konstantin Kolinko wrote: >> 2011/11/2 Konstantin Kolinko : >>> 2011/11/1 Mark Thomas : My current thinking is to add redeployResoucre and reloadResource to Context and deprecate watchedResource, making it a synonym for reloadResource. T

Re: Tagging 7.0.23

2011-11-01 Thread Mark Thomas
On 01/11/2011 22:01, Konstantin Kolinko wrote: > 2011/11/2 Konstantin Kolinko : >> 2011/11/1 Mark Thomas : >>> My current thinking is to add redeployResoucre and reloadResource to >>> Context and deprecate watchedResource, making it a synonym for >>> reloadResource. Thoughts? (I haven't tested this

Re: Tagging 7.0.23

2011-11-01 Thread Konstantin Kolinko
2011/11/2 Konstantin Kolinko : > 2011/11/1 Mark Thomas : >> On 01/11/2011 14:16, Konstantin Kolinko wrote: >>> >>> 1) Re: http://svn.apache.org/viewvc?view=revision&revision=1195965 >> >>> Is it possible to throw a runtime exception from parseParameters() >>> when the limit is reached instead of dr

Re: Tagging 7.0.23

2011-11-01 Thread Konstantin Kolinko
2011/11/1 Mark Thomas : > On 01/11/2011 14:16, Konstantin Kolinko wrote: >> >> 1) Re: http://svn.apache.org/viewvc?view=revision&revision=1195965 > >> Is it possible to throw a runtime exception from parseParameters() >> when the limit is reached instead of dropping the parameters, or you >> think

Re: Tagging 7.0.23

2011-11-01 Thread Mark Thomas
On 01/11/2011 19:42, Mark Thomas wrote: > On 01/11/2011 14:16, Konstantin Kolinko wrote: >> 2) http://markmail.org/message/5k4urwimvvmeqees > > I'll see if I can get that fixed too. Hmm. The problem here is that the context.xml files are registered as resources that trigger reload rather than red

Re: Tagging 7.0.23

2011-11-01 Thread Mark Thomas
On 01/11/2011 14:16, Konstantin Kolinko wrote: > 2011/11/1 Mark Thomas : >> It is that time again. I plan to tag 7.0.23 later today once I have run >> the unit tests and the TCKs to check all is well. >> >> If you have anything you want to get into this release, now is the time >> to commit it. >

Re: Tagging 7.0.23

2011-11-01 Thread Konstantin Kolinko
2011/11/1 Mark Thomas : > It is that time again. I plan to tag 7.0.23 later today once I have run > the unit tests and the TCKs to check all is well. > > If you have anything you want to get into this release, now is the time > to commit it. 1) Re: http://svn.apache.org/viewvc?view=revision&revisi

Tagging 7.0.23

2011-11-01 Thread Mark Thomas
It is that time again. I plan to tag 7.0.23 later today once I have run the unit tests and the TCKs to check all is well. If you have anything you want to get into this release, now is the time to commit it. Cheers, Mark - To u