geowebcache-devel

[Geowebcache-devel] JobManager progress - Memory Only for JobStore added and merged 1.4

[Jim G. <jim...@li...>]

Hello Gabriel,

1: I've made a branch of the LISAsoft clone of GWC that has been rebased, tidying up the history: https://github.com/lisasoft/geowebcache/tree/rebased
2: I've merged your GWC 1.4 commits into this branch and tested it. The GridSet changes and improvements to configuration file management gave me some merge conflicts but it looks fine now.
3: I've added a setting to the JobStore so it will run in memory only and set this as the default, testing turning it on and off and looked at the effects. I also mentioned it in the manual. I think it's ready.

In my testing I noticed:

        xs.alias("keyword", String.class);

was missing from the xstream config, and the config file was writing out as <keywords><string> instead of <keywords><keyword> .... I'm pretty sure that line is meant to be in there but I thought I'd mention it in case it was removed on purpose. It's back in my branch.

So again, I think it's ready for you to pull, but keep in mind that the pull request is on the 'master' branch but you now want the 'rebased' branch.

Thanks!

Jim Groffen.

LISAsoft
Level 1, 30 Currie St
Adelaide SA 5000 Australia
PO Box 8118 Adelaide SA 5001

PH: +61 8 8425 8050
MOB: +61 439 780 969


________________________________
The contents of this email are confidential and may be subject to legal or professional privilege and copyright. No representation is made that this email is free of viruses or other defects. If you have received this communication in error, you may not copy or distribute any part of it or otherwise disclose its contents to anyone. Please advise the sender of your incorrect receipt of this correspondence.

Re: [Geowebcache-devel] JobManager progress - Memory Only for JobStore added and merged 1.4

[Gabriel R. <gr...@op...>]

Hi Jeff,

I'm very sorry for the late reply.
I'll try to get your rebased branch merged on master later today, thanks
for the work on the memory store.

WRT the keywords mapping, I removed it on purpose. Rationale is I've been
working on making the programmatic persistence of the configuration file
work, and that alias from String.class to "keyword" affected all the String
properties in all the configuration objects. I think it was introduced some
time ago when we got a contribution for declaring service metadata, but
mapping all String properties to "keyword" is a no go.
So I changed the 1.3.0 schema for keywords to be like any other String
property. So it ends up as <keywords><string>...</keywords>.
To preserve backwards compatibility with pre 1.3 config files, used the
same mechanism we were already using: an XSL transformation converts
<keyword> to <string> when importing an older config file.

If you look at the latest commits you'll see what I mean. Cause I also
added unit tests! :)

Cheers,
Gabriel

On Sun, Dec 11, 2011 at 10:03 AM, Jim Groffen <jim...@li...>wrote:

>  Hello Gabriel,****
>
> ** **
>
> 1: I’ve made a branch of the LISAsoft clone of GWC that has been rebased,
> tidying up the history:
> https://github.com/lisasoft/geowebcache/tree/rebased****
>
> 2: I’ve merged your GWC 1.4 commits into this branch and tested it. The
> GridSet changes and improvements to configuration file management gave me
> some merge conflicts but it looks fine now.****
>
> 3: I’ve added a setting to the JobStore so it will run in memory only and
> set this as the default, testing turning it on and off and looked at the
> effects. I also mentioned it in the manual. I think it’s ready.****
>
> ** **
>
> In my testing I noticed:****
>
> ** **
>
>         xs.alias("keyword", String.class);****
>
> ** **
>
> was missing from the xstream config, and the config file was writing out
> as <keywords><string> instead of <keywords><keyword> …. I’m pretty sure
> that line is meant to be in there but I thought I’d mention it in case it
> was removed on purpose. It’s back in my branch.****
>
> ** **
>
> So again, I think it’s ready for you to pull, but keep in mind that the
> pull request is on the ‘master’ branch but you now want the ‘rebased’
> branch.****
>
> ** **
>
> Thanks!****
>
> ** **
>
> Jim Groffen.****
>
> ** **
>
> LISAsoft****
>
> Level 1, 30 Currie St****
>
> Adelaide SA 5000 Australia****
>
> PO Box 8118 Adelaide SA 5001****
>
> ** **
>
> PH: +61 8 8425 8050****
>
> MOB: +61 439 780 969****
>
> ** **
>
> ------------------------------
> The contents of this email are confidential and may be subject to legal or
> professional privilege and copyright. No representation is made that this
> email is free of viruses or other defects. If you have received this
> communication in error, you may not copy or distribute any part of it or
> otherwise disclose its contents to anyone. Please advise the sender of your
> incorrect receipt of this correspondence.
>



-- 
Gabriel Roldan
OpenGeo - http://opengeo.org
Expert service straight from the developers.

Re: [Geowebcache-devel] JobManager progress - Memory Only for JobStore added and merged 1.4

[Jim G. <jim...@li...>]

Hey Gabriel,

Thanks!

RE: keyword: Ah I shoulda looked at the history a bit better – I had a feeling it wasn’t just a bug.

I’ll try and be around tonight on IRC if you have questions or need anything.

Regards,

Jim Groffen.

From: gr...@op... [mailto:gr...@op...] On Behalf Of Gabriel Roldan
Sent: Tuesday, December 20, 2011 2:17 AM
To: Jim Groffen
Cc: geo...@li...
Subject: Re: JobManager progress - Memory Only for JobStore added and merged 1.4

Hi Jeff,

I'm very sorry for the late reply.
I'll try to get your rebased branch merged on master later today, thanks for the work on the memory store.

WRT the keywords mapping, I removed it on purpose. Rationale is I've been working on making the programmatic persistence of the configuration file work, and that alias from String.class to "keyword" affected all the String properties in all the configuration objects. I think it was introduced some time ago when we got a contribution for declaring service metadata, but mapping all String properties to "keyword" is a no go.
So I changed the 1.3.0 schema for keywords to be like any other String property. So it ends up as <keywords><string>...</keywords>.
To preserve backwards compatibility with pre 1.3 config files, used the same mechanism we were already using: an XSL transformation converts <keyword> to <string> when importing an older config file.

If you look at the latest commits you'll see what I mean. Cause I also added unit tests! :)

Cheers,
Gabriel

On Sun, Dec 11, 2011 at 10:03 AM, Jim Groffen <jim...@li...<mailto:jim...@li...>> wrote:
Hello Gabriel,

1: I’ve made a branch of the LISAsoft clone of GWC that has been rebased, tidying up the history: https://github.com/lisasoft/geowebcache/tree/rebased
2: I’ve merged your GWC 1.4 commits into this branch and tested it. The GridSet changes and improvements to configuration file management gave me some merge conflicts but it looks fine now.
3: I’ve added a setting to the JobStore so it will run in memory only and set this as the default, testing turning it on and off and looked at the effects. I also mentioned it in the manual. I think it’s ready.

In my testing I noticed:

        xs.alias("keyword", String.class);

was missing from the xstream config, and the config file was writing out as <keywords><string> instead of <keywords><keyword> …. I’m pretty sure that line is meant to be in there but I thought I’d mention it in case it was removed on purpose. It’s back in my branch.

So again, I think it’s ready for you to pull, but keep in mind that the pull request is on the ‘master’ branch but you now want the ‘rebased’ branch.

Thanks!

Jim Groffen.

LISAsoft
Level 1, 30 Currie St
Adelaide SA 5000 Australia
PO Box 8118 Adelaide SA 5001

PH: +61 8 8425 8050
MOB: +61 439 780 969


________________________________
The contents of this email are confidential and may be subject to legal or professional privilege and copyright. No representation is made that this email is free of viruses or other defects. If you have received this communication in error, you may not copy or distribute any part of it or otherwise disclose its contents to anyone. Please advise the sender of your incorrect receipt of this correspondence.



--
Gabriel Roldan
OpenGeo - http://opengeo.org
Expert service straight from the developers.

________________________________
The contents of this email are confidential and may be subject to legal or professional privilege and copyright. No representation is made that this email is free of viruses or other defects. If you have received this communication in error, you may not copy or distribute any part of it or otherwise disclose its contents to anyone. Please advise the sender of your incorrect receipt of this correspondence.

Re: [Geowebcache-devel] JobManager progress - Memory Only for JobStore added and merged 1.4

[Gabriel R. <gr...@op...>]

Hi Jim.

I tried to merge your rebased branch into master, but I'm running into an issue.
Your branch has what looks like a log of duplicate commits.  If you
look at this page <https://github.com/lisasoft/geowebcache/branches>
you'll see that the rebased branch is 60 commits behind and 100
commits ahead of master.
The commit "initialize GeoRSS poller in a background thread", for
example, has the hash ba4004880390e070f4e22f1a6d94a5dcbdbc9b37 and
also b9b8630de55005764a839d257ba6634cb956ecfe.

I would like to merge this into master asap, but am also weary of
committing a messed up history. Worse, I'm not sure how to fix that
right now, would need to invest some time googling and trying.

Do you think you can get a squashed branch that contains just the
couple commits from your work you want me to push to master?

TIA, and sorry for the slow turn around.
Gabriel
On Tue, Dec 20, 2011 at 3:24 AM, Jim Groffen <jim...@li...> wrote:
> Hey Gabriel,
>
>
>
> Thanks!
>
>
>
> RE: keyword: Ah I shoulda looked at the history a bit better – I had a
> feeling it wasn’t just a bug.
>
>
>
> I’ll try and be around tonight on IRC if you have questions or need
> anything.
>
>
>
> Regards,
>
>
>
> Jim Groffen.
>
>
>
> From: gr...@op... [mailto:gr...@op...] On Behalf Of
> Gabriel Roldan
> Sent: Tuesday, December 20, 2011 2:17 AM
> To: Jim Groffen
> Cc: geo...@li...
> Subject: Re: JobManager progress - Memory Only for JobStore added and merged
> 1.4
>
>
>
> Hi Jeff,
>
>
>
> I'm very sorry for the late reply.
> I'll try to get your rebased branch merged on master later today, thanks for
> the work on the memory store.
>
>
>
> WRT the keywords mapping, I removed it on purpose. Rationale is I've been
> working on making the programmatic persistence of the configuration file
> work, and that alias from String.class to "keyword" affected all the String
> properties in all the configuration objects. I think it was introduced some
> time ago when we got a contribution for declaring service metadata, but
> mapping all String properties to "keyword" is a no go.
>
> So I changed the 1.3.0 schema for keywords to be like any other String
> property. So it ends up as <keywords><string>...</keywords>.
>
> To preserve backwards compatibility with pre 1.3 config files, used the same
> mechanism we were already using: an XSL transformation converts <keyword> to
> <string> when importing an older config file.
>
>
>
> If you look at the latest commits you'll see what I mean. Cause I also added
> unit tests! :)
>
>
>
> Cheers,
>
> Gabriel
>
>
>
> On Sun, Dec 11, 2011 at 10:03 AM, Jim Groffen <jim...@li...>
> wrote:
>
> Hello Gabriel,
>
>
>
> 1: I’ve made a branch of the LISAsoft clone of GWC that has been rebased,
> tidying up the history: https://github.com/lisasoft/geowebcache/tree/rebased
>
> 2: I’ve merged your GWC 1.4 commits into this branch and tested it. The
> GridSet changes and improvements to configuration file management gave me
> some merge conflicts but it looks fine now.
>
> 3: I’ve added a setting to the JobStore so it will run in memory only and
> set this as the default, testing turning it on and off and looked at the
> effects. I also mentioned it in the manual. I think it’s ready.
>
>
>
> In my testing I noticed:
>
>
>
>         xs.alias("keyword", String.class);
>
>
>
> was missing from the xstream config, and the config file was writing out as
> <keywords><string> instead of <keywords><keyword> …. I’m pretty sure that
> line is meant to be in there but I thought I’d mention it in case it was
> removed on purpose. It’s back in my branch.
>
>
>
> So again, I think it’s ready for you to pull, but keep in mind that the pull
> request is on the ‘master’ branch but you now want the ‘rebased’ branch.
>
>
>
> Thanks!
>
>
>
> Jim Groffen.
>
>
>
> LISAsoft
>
> Level 1, 30 Currie St
>
> Adelaide SA 5000 Australia
>
> PO Box 8118 Adelaide SA 5001
>
>
>
> PH: +61 8 8425 8050
>
> MOB: +61 439 780 969
>
>
>
>
>
> ________________________________
>
> The contents of this email are confidential and may be subject to legal or
> professional privilege and copyright. No representation is made that this
> email is free of viruses or other defects. If you have received this
> communication in error, you may not copy or distribute any part of it or
> otherwise disclose its contents to anyone. Please advise the sender of your
> incorrect receipt of this correspondence.
>
>
>
>
>
> --
> Gabriel Roldan
> OpenGeo - http://opengeo.org
> Expert service straight from the developers.
>
>
> ________________________________
> The contents of this email are confidential and may be subject to legal or
> professional privilege and copyright. No representation is made that this
> email is free of viruses or other defects. If you have received this
> communication in error, you may not copy or distribute any part of it or
> otherwise disclose its contents to anyone. Please advise the sender of your
> incorrect receipt of this correspondence.



-- 
Gabriel Roldan
OpenGeo - http://opengeo.org
Expert service straight from the developers.

Re: [Geowebcache-devel] JobManager progress - Memory Only for JobStore added and merged 1.4

[Jim G. <jim...@li...>]

Hello Gabriel,

So... I must have botched the rebase. Don't try to merge it,
instead I'll fix up my master branch. I'll find the commits
I did to the rebased branch (there were only a few of them)
so that master is fixed up with the latest code, then make
sure my master is up to date with the GWC master.

Once I'm at that point we'll be ready to go except for some
superfluous commits in my early history. At this point I'll
chat to you about the best way to squash them because I must
have done the rebase wrong.

Regards,

Jim Groffen.


-----Original Message-----
From: gr...@op... [mailto:gr...@op...] On Behalf Of Gabriel Roldan
Sent: Monday, December 26, 2011 5:48 PM
To: Jim Groffen
Cc: geo...@li...
Subject: Re: JobManager progress - Memory Only for JobStore added and merged 1.4

Hi Jim.

I tried to merge your rebased branch into master, but I'm running into an issue.
Your branch has what looks like a log of duplicate commits.  If you
look at this page <https://github.com/lisasoft/geowebcache/branches>
you'll see that the rebased branch is 60 commits behind and 100
commits ahead of master.
The commit "initialize GeoRSS poller in a background thread", for
example, has the hash ba4004880390e070f4e22f1a6d94a5dcbdbc9b37 and
also b9b8630de55005764a839d257ba6634cb956ecfe.

I would like to merge this into master asap, but am also weary of
committing a messed up history. Worse, I'm not sure how to fix that
right now, would need to invest some time googling and trying.

Do you think you can get a squashed branch that contains just the
couple commits from your work you want me to push to master?

TIA, and sorry for the slow turn around.
Gabriel
On Tue, Dec 20, 2011 at 3:24 AM, Jim Groffen <jim...@li...> wrote:
> Hey Gabriel,
>
>
>
> Thanks!
>
>
>
> RE: keyword: Ah I shoulda looked at the history a bit better – I had a
> feeling it wasn’t just a bug.
>
>
>
> I’ll try and be around tonight on IRC if you have questions or need
> anything.
>
>
>
> Regards,
>
>
>
> Jim Groffen.
>
>
>
> From: gr...@op... [mailto:gr...@op...] On Behalf Of
> Gabriel Roldan
> Sent: Tuesday, December 20, 2011 2:17 AM
> To: Jim Groffen
> Cc: geo...@li...
> Subject: Re: JobManager progress - Memory Only for JobStore added and merged
> 1.4
>
>
>
> Hi Jeff,
>
>
>
> I'm very sorry for the late reply.
> I'll try to get your rebased branch merged on master later today, thanks for
> the work on the memory store.
>
>
>
> WRT the keywords mapping, I removed it on purpose. Rationale is I've been
> working on making the programmatic persistence of the configuration file
> work, and that alias from String.class to "keyword" affected all the String
> properties in all the configuration objects. I think it was introduced some
> time ago when we got a contribution for declaring service metadata, but
> mapping all String properties to "keyword" is a no go.
>
> So I changed the 1.3.0 schema for keywords to be like any other String
> property. So it ends up as <keywords><string>...</keywords>.
>
> To preserve backwards compatibility with pre 1.3 config files, used the same
> mechanism we were already using: an XSL transformation converts <keyword> to
> <string> when importing an older config file.
>
>
>
> If you look at the latest commits you'll see what I mean. Cause I also added
> unit tests! :)
>
>
>
> Cheers,
>
> Gabriel
>
>
>
> On Sun, Dec 11, 2011 at 10:03 AM, Jim Groffen <jim...@li...>
> wrote:
>
> Hello Gabriel,
>
>
>
> 1: I’ve made a branch of the LISAsoft clone of GWC that has been rebased,
> tidying up the history: https://github.com/lisasoft/geowebcache/tree/rebased
>
> 2: I’ve merged your GWC 1.4 commits into this branch and tested it. The
> GridSet changes and improvements to configuration file management gave me
> some merge conflicts but it looks fine now.
>
> 3: I’ve added a setting to the JobStore so it will run in memory only and
> set this as the default, testing turning it on and off and looked at the
> effects. I also mentioned it in the manual. I think it’s ready.
>
>
>
> In my testing I noticed:
>
>
>
>         xs.alias("keyword", String.class);
>
>
>
> was missing from the xstream config, and the config file was writing out as
> <keywords><string> instead of <keywords><keyword> …. I’m pretty sure that
> line is meant to be in there but I thought I’d mention it in case it was
> removed on purpose. It’s back in my branch.
>
>
>
> So again, I think it’s ready for you to pull, but keep in mind that the pull
> request is on the ‘master’ branch but you now want the ‘rebased’ branch.
>
>
>
> Thanks!
>
>
>
> Jim Groffen.
>
>
>
> LISAsoft
>
> Level 1, 30 Currie St
>
> Adelaide SA 5000 Australia
>
> PO Box 8118 Adelaide SA 5001
>
>
>
> PH: +61 8 8425 8050
>
> MOB: +61 439 780 969
>
>
>
>
>
> ________________________________
>
> The contents of this email are confidential and may be subject to legal or
> professional privilege and copyright. No representation is made that this
> email is free of viruses or other defects. If you have received this
> communication in error, you may not copy or distribute any part of it or
> otherwise disclose its contents to anyone. Please advise the sender of your
> incorrect receipt of this correspondence.
>
>
>
>
>
> --
> Gabriel Roldan
> OpenGeo - http://opengeo.org
> Expert service straight from the developers.
>
>
> ________________________________
> The contents of this email are confidential and may be subject to legal or
> professional privilege and copyright. No representation is made that this
> email is free of viruses or other defects. If you have received this
> communication in error, you may not copy or distribute any part of it or
> otherwise disclose its contents to anyone. Please advise the sender of your
> incorrect receipt of this correspondence.



--
Gabriel Roldan
OpenGeo - http://opengeo.org
Expert service straight from the developers.

The contents of this email are confidential and may be subject to legal or professional privilege and copyright. No representation is made that this email is free of viruses or other defects. If you have received this communication in error, you may not copy or distribute any part of it or otherwise disclose its contents to anyone. Please advise the sender of your incorrect receipt of this correspondence.