Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/cf6c8232 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/cf6c8232 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/cf6c8232 Branch: refs/heads/master Commit: cf6c82320537b68fc6962165465a88d8bb4a57be Parents: dd333f0 7a61fc0 Author: Sajith Kariyawasam <[email protected]> Authored: Mon Jan 6 18:21:33 2014 +0530 Committer: Sajith Kariyawasam <[email protected]> Committed: Mon Jan 6 18:21:33 2014 +0530 ---------------------------------------------------------------------- .../adc/mgt/persistence/PersistenceManager.java | 7 + .../RegistryBasedPersistenceManager.java | 137 +++++++++++++++++++ .../DataInsertionAndRetrievalManager.java | 16 +++ .../stratos/adc/mgt/utils/Serializer.java | 21 +++ .../configure_stratos.jag | 7 + .../themes/theme1/pages/index.hbs | 1 + .../themes/theme1/partials/cartridges.hbs | 4 +- .../theme1/partials/configure_stratos.hbs | 101 ++++++++++++++ .../themes/theme1/partials/header.hbs | 27 +++- .../themes/theme1/partials/mycartridges.hbs | 34 ----- .../themes/theme1/renderers/cartridges.js | 47 ++++++- .../theme1/renderers/configure_stratos.js | 40 ++++++ .../themes/theme1/renderers/index.js | 59 ++++++-- .../theme1/renderers/subscribe_cartridge.js | 27 ++-- .../themes/theme1/ui/css/main.css | 43 +++++- .../themes/theme1/ui/custom-fonts/style.css | 24 ++-- 16 files changed, 507 insertions(+), 88 deletions(-) ----------------------------------------------------------------------
