On 7/14/10 12:07 PM, David Winslow wrote: > On 07/14/2010 10:10 AM, Andrea Aime wrote: >> Hi, >> the integration work done in the >> http://github.com/aaime/geonode/tree/security >> branch is almost done and I'm wondering how to >> proceed. >> >> First off, given that I'm not a stable member of the geonode >> developer team, how do I pass on the knowledge about what >> was done? >> Should I write docs somewhere? Or talk with someone, probably >> Gabriel? >> A review of the branch is also required. Documentation would be great in general. But I'm going to get into it this afternoon, checking out your branch and talking to you.
TIA, Gabriel >> >> The second question is on how to handle the merging. >> At the moment my branch contains only the pure java modifications, >> and Luke's one the python one. >> Are we supposed to merge on master directly, create another >> branch for the "fusion" of the two? >> >> So far I've made my tests with Luke's branch checked one >> and running on one site, and my branch with GeoServer started >> manually from Eclipse. >> >> Well, let me know how to proceed >> >> Cheers >> Andrea > > docs - I'd like to bring up the idea of using Sphinx for this (it is > working quite well for GeoServer). But, for now, any code-level > documentation can just go in the Trac wiki at > http://projects.opengeo.org/CAPRA/ > > review - yes, Gabriel is the go-to guy for changes to the > GeoNode/GeoServer extensions. > > merging - I suppose this is up to you and Luke as long as any conflicts > are resolved before pushing to the main GeoNode/geonode repository. I > doubt you will see many conflicts between your Django view and GeoServer > extension (:P) so this should be pretty headache-free. For reference, I > would just pick one of your branches (probably aaime/security since it > isn't named 'master') and merge Luke's work onto it, then merge master > onto the integration branch before finally actually merging onto > master. This way if any conflicts DO occur they aren't on your master > branch until they are resolved. > > -- > David Winslow > OpenGeo - http://opengeo.org/ -- Gabriel Roldan OpenGeo - http://opengeo.org Expert service straight from the developers.
