From: Gabriel R. <gr...@op...> - 2012-07-30 15:23:57
|
I've the patch for the org.geowebcache.GeoWebCache.getVersion()/getBuildRevision() methods handy so that'd be just as easy to commit. But: you would be able to use it on GeoServer master right away. On 2.2.x would need to wait till next release (just released 1.3-RC4 last Friday, next one should be 1.3.0 in synch with GS 2.2.0) On Mon, Jul 30, 2012 at 11:01 AM, Justin Deoliveira <jde...@op...> wrote: > Nice. > > As for the conflict I can definitely work around that, so that is no > problem. > > If we could wrap up that code in a utility method that would be great, > although i guess I could also just use the same code snippet. Let me know > what you prefer. > > > On Mon, Jul 30, 2012 at 6:16 AM, Gabriel Roldan <gr...@op...> wrote: >> >> Ok, I see how the Git-Revision entry can conflict. >> >> This is what GWC does for the build info in the front page: >> Package versionInfo = Package.getPackage("org.geowebcache"); >> String version = versionInfo.getSpecificationVersion(); >> String commitId = versionInfo.getImplementationVersion(); >> if (version == null) { >> version = "{NO VERSION INFO IN MANIFEST}"; >> } >> if (commitId == null) { >> commitId = "{NO BUILD INFO IN MANIFEST}"; >> } >> >> I just changed getImplementationVersion() to return the git commit id >> instead of the built date. >> I would rather stick to that "standard" manifest entry. But can do an >> utility class in the same spirit than GeoTools.getBuildRevision(). >> Would that work? >> >> On Sat, Jul 28, 2012 at 12:24 PM, Justin Deoliveira >> <jde...@op...> wrote: >> > Ok, so tricker originally than I thought. One because loading the >> > manfiest >> > entries from both jars conflict with each other, but i think i have that >> > one >> > licked. The second is issue is loading the info from the web ui. Ideally >> > we >> > could a similar class in gwc as the GeoTools class for providing the >> > version/revision info at runtime. Any objection to this Gabriel? I can >> > whip >> > up a quick patch if not. >> > >> > >> > On Sat, Jul 28, 2012 at 7:08 AM, Justin Deoliveira >> > <jde...@op...> >> > wrote: >> >> >> >> Nice, that should be it. Thanks Gabriel. I will do a build locally and >> >> try >> >> it out. >> >> >> >> >> >> On Fri, Jul 27, 2012 at 1:22 PM, Gabriel Roldan <gr...@op...> >> >> wrote: >> >>> >> >>> ok, added a Git-Revision entry to the gwc MANIFEST files just like the >> >>> GeoTools ones (e.g. Git-Revision: >> >>> 152220479ae9bbf0e76ba1d2c416b3027f9f8683). >> >>> >> >>> Is that all what's needed? >> >>> >> >>> On Fri, Jul 27, 2012 at 5:03 PM, Gabriel Roldan <gr...@op...> >> >>> wrote: >> >>> > Guess we should do the same in GWC then. >> >>> > So far GWC jar manifests has the bellow info. It should be as easy >> >>> > to >> >>> > add git revision. >> >>> > >> >>> > Built-By: groldan >> >>> > Build-Jdk: 1.5.0_22 >> >>> > Implementation-Title: org.geowebcache >> >>> > Implementation-Vendor: http://geowebcache.org >> >>> > Implementation-Version: 2012-07-26 23:49:38 >> >>> > Specification-Title: org.geowebcache >> >>> > Specification-Vendor: http://geowebcache.org >> >>> > Specification-Version: 1.3-RC4 >> >>> > >> >>> > >> >>> > On Fri, Jul 27, 2012 at 11:21 AM, Justin Deoliveira >> >>> > <jde...@op...> wrote: >> >>> >> Definitely. To do this we need some way to pull that info out of >> >>> >> the >> >>> >> gwc >> >>> >> artifacts. For GeoTools we include it in the manifest of all jars. >> >>> >> >> >>> >> >> >>> >> On Thu, Jul 26, 2012 at 8:21 PM, Ben Caradoc-Davies >> >>> >> <Ben...@cs...> wrote: >> >>> >>> >> >>> >>> GeoServer VERSION.txt contains information that is very useful in >> >>> >>> identifying the GeoServer and GeoTools snapshots contained in a >> >>> >>> build: >> >>> >>> >> >>> >>> version = 2.3-SNAPSHOT >> >>> >>> git revision = f4823f9d60ec66ba64bde591ccd6b096fb0bc7ce >> >>> >>> git branch = f4823f9d60ec66ba64bde591ccd6b096fb0bc7ce >> >>> >>> build date = 20120727-0501 >> >>> >>> geotools version = 9-SNAPSHOT >> >>> >>> geotools revision = 9b2133c0fdab0dc03800831d7e9ca759ef1f388b >> >>> >>> >> >>> >>> The programmatic interface is used to populate the About GeoServer >> >>> >>> page >> >>> >>> with similar information. >> >>> >>> >> >>> >>> Now that GeoServer master depends on GWC snapshots, should >> >>> >>> VERSION.txt and >> >>> >>> the About GeoServer page also contain GWC version info? >> >>> >>> >> >>> >>> Kind regards, >> >>> >>> >> >>> >>> -- >> >>> >>> Ben Caradoc-Davies <Ben...@cs...> >> >>> >>> Software Engineer >> >>> >>> CSIRO Earth Science and Resource Engineering >> >>> >>> Australian Resources Research Centre >> >>> >>> >> >>> >> >> >>> >> >> >>> >> >> >>> >> -- >> >>> >> Justin Deoliveira >> >>> >> OpenGeo - http://opengeo.org >> >>> >> Enterprise support for open source geospatial. >> >>> >> >> >>> > >> >>> > >> >>> > >> >>> > -- >> >>> > Gabriel Roldan >> >>> > OpenGeo - http://opengeo.org >> >>> > Expert service straight from the developers. >> >>> >> >>> >> >>> >> >>> -- >> >>> Gabriel Roldan >> >>> OpenGeo - http://opengeo.org >> >>> Expert service straight from the developers. >> >> >> >> >> >> >> >> >> >> -- >> >> Justin Deoliveira >> >> OpenGeo - http://opengeo.org >> >> Enterprise support for open source geospatial. >> >> >> > >> > >> > >> > -- >> > Justin Deoliveira >> > OpenGeo - http://opengeo.org >> > Enterprise support for open source geospatial. >> > >> >> >> >> -- >> Gabriel Roldan >> OpenGeo - http://opengeo.org >> Expert service straight from the developers. > > > > > -- > Justin Deoliveira > OpenGeo - http://opengeo.org > Enterprise support for open source geospatial. > -- Gabriel Roldan OpenGeo - http://opengeo.org Expert service straight from the developers. |