Cool, thanks Alex. cheers Geoff
———————————————————— Gnu PGP key - http://is.gd/TTTTuI > On 1 Feb 2016, at 21:54, Alex Heneveld <[email protected]> > wrote: > > > Geoff, > > I did. Bringing pull requests across (without history I'm afraid) is > described at the bottom here: > > https://github.com/apache/brooklyn-docs/blob/master/guide/dev/code/submodules.md > > It works for any work in incubator. Basically you need to merge the WIP/PR > with incubator master, then make a diff against master, than patch that into > the parent of the new projects. > > Also FYI the submodules setup is also now merged. > > I am working on updating the snapshot docs so there is a more readable > version. > > Best > Alex > > > On 01/02/2016 21:43, Geoff Macartney wrote: >> hi Alex, >> >> awesome! - quick question, I was checking but I can’t remember if you sent >> instructions for bringing pull requests from incubator over to the new >> repos, did you? >> >> Geoff >> >> >> ———————————————————— >> Gnu PGP key - http://is.gd/TTTTuI >> >> >>> On 1 Feb 2016, at 20:12, Alex Heneveld <[email protected]> >>> wrote: >>> >>> >>> All- >>> >>> I'm delighted to report that *the migration is now complete*. All repos at >>> [1] are now populated. >>> >>> I will follow up shortly with instructions on building and using, but if >>> you're impatient see the README at [2]. >>> >>> You may have received *nearly 1500 emails* from "[email protected]" about >>> the commits to the different repos and branches. You might want to search >>> for that sender and delete them. (I don't actually send emails from that >>> address.) There shouldn't be any further such mails! >>> >>> Best >>> Alex >>> >>> [1] https://github.com/apache/?query=brooklyn >>> [2] https://github.com/apache/brooklyn >>> >>> On 31/01/2016 12:37, Alex Heneveld wrote: >>>> Hi All- >>>> >>>> Thanks for the feedback. I have everything set to push to the new repos; >>>> but we are blocked on an access issue to the new git repos (permissions). >>>> You can see the latest in the "ahgittin" repos, in the original email >>>> (below). (BTW Aled I checked and if the commits are identical throughout >>>> history then it seems the commit ID's *are* deterministic.) >>>> >>>> If we can get this resolved within 24h then I suggest we proceed with the >>>> original plan, ie no more commits to incubator, but if not then in order >>>> not to block development and pushes then we rescind the moratorium and >>>> continue using incubator until we can cut over without disruption. >>>> >>>> Old PR's should be easy to move across. For reference the current PR's >>>> are: >>>> >>>> 1177] Improvements to brooklyn-server/rest/rest-api ( >>>> https://github.com/apache/incubator-brooklyn/pull/1177 ) >>>> 1176] Generate config/effector descriptions for yaml-only blueprints ( >>>> https://github.com/apache/incubator-brooklyn/pull/1176 ) >>>> 1168] Uses externally accessible address for main uri of controller ( >>>> https://github.com/apache/incubator-brooklyn/pull/1168 ) >>>> 1140] [WIP] CXF implementation of rest api ( >>>> https://github.com/apache/incubator-brooklyn/pull/1140 ) >>>> 1128] [WIP] Parameterize the start effector ( >>>> https://github.com/apache/incubator-brooklyn/pull/1128 ) >>>> 1124] On stop Application, unmanage location provisioner ( >>>> https://github.com/apache/incubator-brooklyn/pull/1124 ) >>>> 1093] Fix/deferred location config ( >>>> https://github.com/apache/incubator-brooklyn/pull/1093 ) >>>> 950] Windows script files ( >>>> https://github.com/apache/incubator-brooklyn/pull/950 ) >>>> 930] [BROOKLYN-177] wip: drag and drop support for yaml editor ( >>>> https://github.com/apache/incubator-brooklyn/pull/930 ) >>>> 924] Added basic migration capability to >>>> org.apache.brooklyn.entity.webapp.* ( >>>> https://github.com/apache/incubator-brooklyn/pull/924 ) >>>> 918] Adding CloudFoundry support. ( >>>> https://github.com/apache/incubator-brooklyn/pull/918 ) >>>> 865] [BROOKLYN-166] add codemirror, yaml syntax-highlighting, >>>> autocompletion) ( https://github.com/apache/incubator-brooklyn/pull/865 ) >>>> 738] Bundle rebind transformers with blueprints ( >>>> https://github.com/apache/incubator-brooklyn/pull/738 ) >>>> 621] Wildfly 8 Support (Partial) ( >>>> https://github.com/apache/incubator-brooklyn/pull/621 ) >>>> >>>> (Generated using github's "hub" tool -- early stages but promising.) >>>> >>>> Best >>>> Alex >>>> >>>> >>>> On 28/01/2016 22:12, Richard Downer wrote: >>>>> +1. In about a week I'll be drafting the last of our three initial >>>>> monthly reports to the board; I'd love to say that we have shed our >>>>> "incubating" repository tag! >>>>> >>>>> Richard. >>>>> >>>>> >>>>> On 28 January 2016 at 10:09, Alex Heneveld >>>>> <[email protected]> wrote: >>>>>> Brooklyners- >>>>>> >>>>>> TL;DR: *switch to new repos at the weekend, incubator commits cut-off >>>>>> proposed for Sat 10am UK* >>>>>> >>>>>> The new project structure seems to be working well and I think it's time >>>>>> to >>>>>> move to the new repos apache/brooklyn and apache/brooklyn-*, and then >>>>>> retire >>>>>> the incubator project. >>>>>> >>>>>> I've built on Richard's separation scripts, with the current version at >>>>>> https://github.com/ahgittin/brooklyn-repo-split, and it also seems to be >>>>>> working very well. You can inspect the resulting projects at these >>>>>> URL's: >>>>>> >>>>>> https://github.com/ahgittin/brooklyn >>>>>> https://github.com/ahgittin/brooklyn-dist >>>>>> https://github.com/ahgittin/brooklyn-docs >>>>>> https://github.com/ahgittin/brooklyn-library >>>>>> https://github.com/ahgittin/brooklyn-server >>>>>> https://github.com/ahgittin/brooklyn-ui >>>>>> >>>>>> You can try them for yourself e.g. using: >>>>>> >>>>>> for x in brooklyn{,-{dist,docs,library,server,ui}} ; do >>>>>> git clone [email protected]:ahgittin/$x.git >>>>>> done >>>>>> cd brooklyn/ >>>>>> mvn clean install >>>>>> >>>>>> I have done a lot of checking that these are all healthy -- see below -- >>>>>> but >>>>>> I'd value some others also casting their eyes over the projects. If >>>>>> there >>>>>> are other checks I should do when I run them again please let me know. >>>>>> >>>>>> If this looks good I propose we wait until the weekend to cut over. If >>>>>> there >>>>>> is no objection we would STOP committing to the incubator project at >>>>>> Saturday 10am UK, and I will re-run the scripts, test, and push to >>>>>> apache/ >>>>>> repos instead of ahgittin. >>>>>> >>>>>> Meanwhile I have some notes on migrating incubator PR's and branches to >>>>>> the >>>>>> new repos and on using subprojects which I will complete and circulate. >>>>>> >>>>>> Best >>>>>> Alex >>>>>> >>>>>> >>>>>> CHECKS I'VE DONE >>>>>> >>>>>> A) The command: >>>>>> >>>>>> git log --oneline --follow `find . -name AbstractEntity.java` >>>>>> >>>>>> gives the same output modulo commit ID's and excluding the additional >>>>>> directory promotion commit in the new repo, 415 commits total >>>>>> >>>>>> B) `find .` gives the same output, modulo items in the root and the .git/ >>>>>> dirs (actual command: `find -E . \! -regex '.*/\.git(/.*)?' \! -regex >>>>>> '\./[[:alnum:]\.]+'`) >>>>>> >>>>>> C) Both builds work and the built artifacts are identical except for >>>>>> MANIFEST.MF (Implementation-SHA-1 and Bnd-LastModified) and >>>>>> pom.properties >>>>>> (timestamp) >>>>>> >>>>>> D) Size of project is the same and history is substantially smaller: >>>>>> >>>>>> incubator: >>>>>> >>>>>> 262M ./.git >>>>>> 44K ./brooklyn >>>>>> 652K ./brooklyn-dist >>>>>> 16M ./brooklyn-docs >>>>>> 9.6M ./brooklyn-library >>>>>> 19M ./brooklyn-server >>>>>> 5.1M ./brooklyn-ui >>>>>> 312M . >>>>>> of which 262M is */.git, 50M current >>>>>> >>>>>> new: >>>>>> >>>>>> 180K ./brooklyn/.git >>>>>> 224K ./brooklyn >>>>>> 812K ./brooklyn-dist/.git >>>>>> 1.4M ./brooklyn-dist >>>>>> 20M ./brooklyn-docs/.git >>>>>> 36M ./brooklyn-docs >>>>>> 15M ./brooklyn-library/.git >>>>>> 24M ./brooklyn-library >>>>>> 36M ./brooklyn-server/.git >>>>>> 55M ./brooklyn-server >>>>>> 7.6M ./brooklyn-ui/.git >>>>>> 13M ./brooklyn-ui >>>>>> 129M . >>>>>> of which 79M is */.git, 50M current >>>>>> >>>>>> The size improvement comes of course from big WAR artifacts in ancient >>>>>> history which aren't being copied across. >>>>>> >>>>>> The remaining size is mostly accounted for by: >>>>>> * screenshots in docs >>>>>> * some big JS in library/sandbox history and in ui (a bit of a shame as >>>>>> when >>>>>> we move to bower/grunt these deps won't be part of the repo, but a few >>>>>> megs >>>>>> isn't really that much) >>>>>> * lots of files in server and its history (none esp big, nearly all >>>>>> needed) >>>>>> >>>>>> END >>>>>> >> >
