tag | 52ca54ed566b4169751fda98a4873a1d3c7c52fe | |
---|---|---|
tagger | Todd Nine <tnine@apigee.com> | Tue Jan 07 19:35:06 2014 -0500 |
object | 17eb8e79dea0417ec5f9fb1980b1531601fbd45d |
commit | 17eb8e79dea0417ec5f9fb1980b1531601fbd45d | [log] [tgz] |
---|---|---|
author | Todd Nine <tnine@apigee.com> | Tue Jan 07 12:43:15 2014 -0500 |
committer | Todd Nine <tnine@apigee.com> | Tue Jan 07 12:43:15 2014 -0500 |
tree | 0fa491bd82c8cceff291ae49b1e3957f930f0a4d | |
parent | 7b0d0d0bd2cd2ba52fcf01c5d069ed8e3c289075 [diff] |
Fixes issue
Apache Usergrid is a multi-tenant Backend-as-a-Service stack for web & mobile applications, based on RESTful APIs. It is currently incubating at the Apache Software Foundation.
This repository contains all the code for Apache Usergrid, including the server stack, portal, client and SDKs. Each of them have their own, much more detailed README in the corresponding subdirectories.
/stack
. You can install dependencies and compile it with maven. See stack/README.md for instructions./ugc
. You can install it on your machine with a simple sudo gem install ugc
/portal
/sdks
.If you previously developed with Apache Usergrid, you know our code used to be structured into separate repositories: usergrid-stack, usergrid-portal, etc. We are now using a merged repository.
You just need to clone this repository, and use git subtree (usually requires git 1.8+) to merge your changes under the new structure. Here’s an example for a portal fork. Adjust the prefix, repository address and branch you want to pull from as necessary.
git clone git@github.com:usergrid/usergrid.git cd usergrid git subtree pull --prefix=portal git@github.com:my-github-account/my-usergrid-portal-fork.git master
This will pull (i.e. merge) the changes you made from the master branch of github.com/my-github-account/my-usergrid-portal-fork into the portal/ subfolder. It should ask you to provide a commit message for the merge. There’s lot of flexibility on how to fetch and merge, please see the git subtree manual for details. Then please do consider sending us a pull request with these changes ;)
You should really update your old repositories to the new structure with the instructions above, but the following may work for you, although we make no guarantee they will work in the future.
You can produce a branch compatible with the old repos by using git subtree (usually requires git 1.8+). Then from this repository you can
git clone git@github.com:usergrid/usergrid.git cd usergrid git checkout master git subtree split --prefix=portal -b portal git checkout portal
This will create a “portal” branch that is compatible with the old usergrid-portal repository, from the code under the portal/ directory. You can pull from that branch (or push changes to it, although we will not accept pull requests sent thusly).
The git subtree split
above should function for portal, ugc, and any of the SDKs, but will not work for the stack, due to some anonymous comments left in the tree that prevent a split, and cannot be corrected lest we break the history and force a rebase on all forks.
Please update your code setup as soon as possible and ask the dev list if you have any questions!