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/ba20d4b6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ba20d4b6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ba20d4b6 Branch: refs/heads/master Commit: ba20d4b6ff5909cc309accdfc3832c6b2b2a8d64 Parents: 5a80c80 224f200 Author: Udara Liyanage <[email protected]> Authored: Mon Nov 25 13:23:53 2013 -0500 Committer: Udara Liyanage <[email protected]> Committed: Mon Nov 25 13:23:53 2013 -0500 ---------------------------------------------------------------------- components/org.apache.stratos.adc.mgt/pom.xml | 5 + .../adc/mgt/dao/CartridgeSubscriptionInfo.java | 9 ++ .../internal/ADCManagementServerComponent.java | 2 +- .../manager/CartridgeSubscriptionManager.java | 12 +- .../adc/mgt/payload/NonCarbonPayload.java | 5 +- .../apache/stratos/adc/mgt/payload/Payload.java | 4 +- .../stratos/adc/mgt/payload/PayloadArg.java | 9 ++ .../service/RepositoryInformationService.java | 6 +- .../mgt/subscription/CartridgeSubscription.java | 12 +- .../subscription/DataCartridgeSubscription.java | 3 +- .../MultiTenantCartridgeSubscription.java | 2 +- .../SingleTenantCartridgeSubscription.java | 2 +- .../mgt/utils/ApplicationManagementUtil.java | 50 +++++--- .../adc/mgt/utils/PersistenceManager.java | 13 +- .../adc/mgt/utils/RepoPasswordMgtUtil.java | 16 ++- .../distribution/src/main/conf/log4j.properties | 2 +- .../src/main/resources/log4j.properties | 4 +- .../cartridge-agent/ec2/php/cartridge-agent.sh | 123 ------------------- .../src/main/resources/log4j.properties | 6 +- .../resources/stratos_foundation.sql | 1 + 20 files changed, 116 insertions(+), 170 deletions(-) ----------------------------------------------------------------------
