fixing a conflict in cartridge agent
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/daa06a0f Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/daa06a0f Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/daa06a0f Branch: refs/heads/master Commit: daa06a0ff8764985e8cddc3d1140bdf128245ef1 Parents: f4a82d1 fc9eb2a Author: Isuru <[email protected]> Authored: Fri Jan 17 15:15:24 2014 +0530 Committer: Isuru <[email protected]> Committed: Fri Jan 17 15:15:24 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/NetworkPartitionContext.java | 188 ++--- .../autoscaler/NetworkPartitionLbHolder.java | 496 +++++++++++++ .../autoscaler/api/AutoScalerServiceImpl.java | 28 +- .../internal/AutoscalerServerComponent.java | 10 +- .../health/AutoscalerHealthStatReceiver.java | 2 +- .../autoscaler/monitor/ClusterMonitor.java | 2 +- .../autoscaler/partition/PartitionManager.java | 37 +- .../autoscaler/registry/RegistryManager.java | 41 +- .../rule/AutoscalerRuleEvaluator.java | 10 +- .../autoscaler/rule/RuleTasksDelegator.java | 26 +- .../autoscaler/util/AutoScalerConstants.java | 2 +- .../stratos/autoscaler/util/AutoscalerUtil.java | 25 +- .../git/impl/GitBasedArtifactRepository.java | 41 +- .../status/InstanceStatusEventMessageQueue.java | 2 +- .../conf/LoadBalancerConfiguration.java | 4 +- .../LoadBalancerStatisticsCollector.java | 4 +- .../console/console.iws | 719 ------------------- .../console/controllers/addTenantSubmit.jag | 9 + .../controllers/cartridgeDefintionSubmit.jag | 3 +- .../console/controllers/lbDefinitionSubmit.jag | 9 + .../controllers/partitionDefinitionSubmit.jag | 9 + .../controllers/policyDefinitionSubmit.jag | 9 + .../theme1/partials/cartridge_deployments.hbs | 3 +- .../console/themes/theme1/partials/header.hbs | 12 +- .../console/themes/theme1/partials/lbs.hbs | 40 +- .../theme1/partials/partition_deployments.hbs | 42 +- .../theme1/partials/policy_deployments.hbs | 40 +- .../console/themes/theme1/renderers/index.js | 6 +- .../console/themes/theme1/theme.js | 43 +- .../console/util/utility.jag | 60 +- .../manager/CartridgeSubscriptionManager.java | 20 +- .../filter/topology/TopologyClusterFilter.java | 2 +- .../filter/topology/TopologyMemberFilter.java | 2 +- .../filter/topology/TopologyServiceFilter.java | 2 +- .../message/receiver/tenant/TenantManager.java | 2 +- .../distribution/src/main/conf/scaling.drl | 95 +-- ...ryjs.hostobjects.xhr_0.9.0.ALPHA4_wso2v1.jar | Bin 0 -> 11856 bytes .../modules/distribution/src/assembly/bin.xml | 8 + tools/stratos-installer/README.txt | 24 +- 39 files changed, 1032 insertions(+), 1045 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/daa06a0f/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/impl/GitBasedArtifactRepository.java ---------------------------------------------------------------------- diff --cc components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/impl/GitBasedArtifactRepository.java index f5d658d,e8934ad..e8fe5c6 --- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/impl/GitBasedArtifactRepository.java +++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/impl/GitBasedArtifactRepository.java @@@ -53,7 -53,8 +53,9 @@@ public class GitBasedArtifactRepositor //Map to keep track of git context per tenant (remote urls, jgit git objects, etc.) private static ConcurrentHashMap<Integer, RepositoryContext> tenantToRepoContextMap = new ConcurrentHashMap<Integer, RepositoryContext>(); + private static volatile GitBasedArtifactRepository gitBasedArtifactRepository; + private static String SUPER_TENANT_APP_PATH = "/repository/deployment/server/"; + private static String TENANT_PATH = "/repository/tenants/"; private GitBasedArtifactRepository () {
