Merge branch 'master' of https://github.com/apache/stratos into tenant-isolation-v1
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/9002585d Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/9002585d Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/9002585d Branch: refs/heads/tenantisolation Commit: 9002585deb15395fa76afa15f428b6d006ce1011 Parents: 2078778 4e84f86 Author: Dinithi <[email protected]> Authored: Mon Jun 29 13:10:41 2015 +0530 Committer: Dinithi <[email protected]> Committed: Mon Jun 29 13:10:41 2015 +0530 ---------------------------------------------------------------------- .../stratos/common/beans/UserInfoBean.java | 3 +++ .../controllers/forms/schema/users/users.json | 1 - .../management/StratosUserManagerUtils.java | 10 ++++++- .../persistence/MockPersistenceManager.java | 28 +++++++++++++++----- .../iaas/persistence/PersistenceManager.java | 21 ++++++++++++--- .../persistence/PersistenceManagerFactory.java | 8 +++++- .../mock/iaas/persistence/RegistryManager.java | 12 ++++----- .../rest/endpoint/api/StratosApiV41Utils.java | 13 ++++----- .../src/main/webapp/api/WEB-INF/cxf-servlet.xml | 1 + 9 files changed, 73 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/9002585d/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java ----------------------------------------------------------------------
