You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2013/12/12 15:54:53 UTC
[1/2] git commit: adding a log before register service call
Updated Branches:
refs/heads/master ebc27c32d -> 842562471
adding a log before register service call
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/d174f158
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d174f158
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d174f158
Branch: refs/heads/master
Commit: d174f158597047002906b30f753c0b8fea9a8465
Parents: 3a5b5d0
Author: Isuru <is...@wso2.com>
Authored: Thu Dec 12 20:24:18 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Thu Dec 12 20:24:18 2013 +0530
----------------------------------------------------------------------
.../tenancy/SubscriptionSingleTenantBehaviour.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d174f158/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/tenancy/SubscriptionSingleTenantBehaviour.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/tenancy/SubscriptionSingleTenantBehaviour.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/tenancy/SubscriptionSingleTenantBehaviour.java
index b424e28..35e1dd1 100644
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/tenancy/SubscriptionSingleTenantBehaviour.java
+++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/tenancy/SubscriptionSingleTenantBehaviour.java
@@ -53,6 +53,14 @@ public class SubscriptionSingleTenantBehaviour extends SubscriptionTenancyBehavi
public void registerSubscription(Properties properties) throws ADCException, UnregisteredCartridgeException {
+ //TODO: change to debug
+ log.info("Type: " + cartridgeSubscription.getType() +
+ " \n Cluster Domain: " + cartridgeSubscription.getCluster().getClusterDomain() +
+ " \n Cluster Sub-Domain: " + cartridgeSubscription.getCluster().getClusterSubDomain() +
+ " \n Tenant Range: " + cartridgeSubscription.getPayload().getPayloadArg().getTenantRange() +
+ " \n Autoscaling Policy: " + cartridgeSubscription.getAutoscalingPolicyName() +
+ " \n Deployment Policy: " + cartridgeSubscription.getDeploymentPolicyName());
+
ApplicationManagementUtil.registerService(cartridgeSubscription.getType(),
cartridgeSubscription.getCluster().getClusterDomain(),
cartridgeSubscription.getCluster().getClusterSubDomain(),
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by is...@apache.org.
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/84256247
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/84256247
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/84256247
Branch: refs/heads/master
Commit: 8425624711aa71c11135a6e79d4a137f09dd796e
Parents: d174f15 ebc27c3
Author: Isuru <is...@wso2.com>
Authored: Thu Dec 12 20:24:37 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Thu Dec 12 20:24:37 2013 +0530
----------------------------------------------------------------------
.../src/conf/cartridge-config.properties | 2 +
.../manager/CartridgeSubscriptionManager.java | 2 +-
.../stratos/adc/mgt/payload/CarbonPayload.java | 8 +-
.../apache/stratos/adc/mgt/payload/Payload.java | 7 +-
.../adc/mgt/utils/CartridgeConstants.java | 1 +
.../apache/stratos/cli/CartridgeInfoBean.java | 20 +-
.../apache/stratos/cli/GenericRestClient.java | 6 +-
.../java/org/apache/stratos/cli/RestClient.java | 13 +-
.../stratos/cli/RestCommandLineService.java | 142 +++++++---
.../stratos/cli/commands/AddTenantCommand.java | 20 +-
.../stratos/cli/commands/SubscribeCommand.java | 13 +-
.../apache/stratos/cli/utils/CliConstants.java | 7 +-
.../impl/CloudControllerServiceImpl.java | 99 +++----
.../cloud/controller/pojo/Cartridge.java | 9 -
.../runtime/FasterLookUpDataHolder.java | 4 +
.../controller/topology/TopologyBuilder.java | 52 ++--
.../controller/util/CloudControllerUtil.java | 5 +-
.../messaging/domain/topology/Cluster.java | 2 +-
.../AverageLoadAverageEventFormatter.xml | 2 +-
.../AverageMemoryConsumptionEventFormatter.xml | 2 +-
.../FaultMessageEventFormatter.xml | 2 +-
.../GradientLoadAverageEventFormatter.xml | 2 +-
.../GradientMemoryConsumptionEventFormatter.xml | 2 +-
...econdDerivativeLoadAverageEventFormatter.xml | 2 +-
...erivativeMemoryConsumptionEventFormatter.xml | 2 +-
.../execution-plans/AverageHeathRequest.xml | 6 +-
.../execution-plans/GradientOfHealthRequest.xml | 6 +-
.../SecondDerivativeOfHealthRequest.xml | 4 +-
.../stream-manager-config.xml | 6 -
.../resources/conf/cartridge-config.properties | 2 +
.../agent/health/publisher/HealthPublisher.java | 10 +-
.../puppet/etc/puppet/files/cartridge-agent.sh | 108 ++++++++
tools/puppet/etc/puppet/files/environment | 22 ++
.../puppet/etc/puppet/files/event-publisher.sh | 28 ++
.../puppet/etc/puppet/files/event-subscriber.sh | 28 ++
.../etc/puppet/files/get-launch-params.rb | 54 ++++
.../puppet/etc/puppet/files/health-publisher.sh | 33 +++
tools/puppet/etc/puppet/files/healthcheck.sh | 31 +++
tools/puppet/etc/puppet/fileserver.conf | 35 +++
tools/puppet/manifests/classes/apt.pp | 43 ++++
tools/puppet/manifests/classes/hosts.pp | 29 +++
tools/puppet/manifests/classes/java.pp | 65 +++++
tools/puppet/manifests/classes/mcollective.pp | 84 ++++++
tools/puppet/manifests/classes/php_cartridge.pp | 141 ++++++++++
tools/puppet/manifests/classes/ssh.pp | 61 +++++
tools/puppet/manifests/classes/system_config.pp | 77 ++++++
tools/puppet/manifests/nodes.pp | 63 +++++
tools/puppet/manifests/site.pp | 23 ++
tools/puppet/modules/apt/files/90forceyes | 23 ++
.../modules/commons/files/bin/puppet_init.sh | 53 ++++
.../modules/commons/files/bin/sign_jars.sh | 39 +++
.../configs/bin/native/wrapper-linux-x86-32 | Bin 0 -> 111027 bytes
.../commons/files/configs/lib/home/favicon.ico | Bin 0 -> 1150 bytes
tools/puppet/modules/commons/files/environment | 23 ++
.../java/files/jars/copy_java_patches_here | 22 ++
.../java/files/jdk-7u7-linux-x64.tar.gz.file | 22 ++
.../php_cartridge/etc/apache2/apache2.conf.erb | 256 +++++++++++++++++++
.../etc/apache2/sites-available/default-ssl.erb | 195 ++++++++++++++
.../etc/apache2/sites-available/default.erb | 64 +++++
.../resources/stratos_foundation.sql | 2 +-
60 files changed, 1871 insertions(+), 213 deletions(-)
----------------------------------------------------------------------