You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by pr...@apache.org on 2014/01/19 05:42:05 UTC
[1/2] git commit: integration bits. Now the flow is complete up to
subscribing a cartridge
Updated Branches:
refs/heads/master 8997301ed -> f0b70784f
integration bits. Now the flow is complete up to subscribing a cartridge
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/1f2f9d00
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/1f2f9d00
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/1f2f9d00
Branch: refs/heads/master
Commit: 1f2f9d00529d48b6d2a4bcab6ed3193751dea02c
Parents: 9960fae
Author: Pradeep Fernando <pr...@gmail.com>
Authored: Sun Jan 19 10:11:00 2014 +0530
Committer: Pradeep Fernando <pr...@gmail.com>
Committed: Sun Jan 19 10:11:00 2014 +0530
----------------------------------------------------------------------
.../org.apache.stratos.manager.console/console/index.jag | 2 ++
.../console/themes/theme1/partials/mycartridges.hbs | 2 +-
.../console/themes/theme1/partials/subscribe_cartridge.hbs | 4 ++--
.../console/themes/theme1/renderers/index.js | 6 +++++-
.../console/themes/theme1/renderers/subscribe_cartridge.js | 4 ++--
5 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1f2f9d00/components/org.apache.stratos.manager.console/console/index.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/index.jag b/components/org.apache.stratos.manager.console/console/index.jag
index c3b5141..1d13654 100644
--- a/components/org.apache.stratos.manager.console/console/index.jag
+++ b/components/org.apache.stratos.manager.console/console/index.jag
@@ -1,7 +1,9 @@
<%
+var log = new Log("console.index");
var caramel = require('caramel')
var utils = require('/util/utility.jag');
var subscribedCartridges = utils.consoleAppUtil.getSubscribedCartridges();
+log.info(subscribedCartridges);
caramel.render({
mycartridges:subscribedCartridges
});
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1f2f9d00/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs
index 2e5d831..a69cdb3 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs
@@ -5,7 +5,7 @@
</div>
</div>
</div>
-{{#each cartridges}}
+{{#each mycartridges}}
<div class="container">
<div class="row">
<div class="col-lg-12">
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1f2f9d00/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs
index 607f824..70a4b90 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs
@@ -72,7 +72,7 @@
data-help-x-offset="50"
data-help-y-offset="-10" >
{{#each autoScalePolicies}}
- <option>{{foo}}</option>
+ <option>{{id}}</option>
{{/each}}
</select>
</div>
@@ -89,7 +89,7 @@
data-help-x-offset="50"
data-help-y-offset="-10" >
{{#each deploymentPolicies}}
- <option>{{foo}}</option>
+ <option>{{id}}</option>
{{/each}}
</select>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1f2f9d00/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
index 3540c30..51d0c7a 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
@@ -17,6 +17,10 @@ var render = function (theme, data, meta, require) {
}
}
cartridgesToPush.push(cartridges_old[i]);
+ var log = new Log("index.js");
+ log.info("cartridges old : "+ stringify(cartridges_old) );
+ log.info("cartridges new : "+ stringify(cartridges_new) );
+ log.info("cartridges to push : "+ stringify(cartridgesToPush));
} else {
cartridgesToPush = null;
for (var j = 0; j < cartridges_new.length; j++) {
@@ -32,7 +36,7 @@ var render = function (theme, data, meta, require) {
}
}
var log = new Log();
- log.info(meta.request.permissions);
+ log.info("permission object : "+meta.request.permissions);
theme('index', {
body: [
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1f2f9d00/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/subscribe_cartridge.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/subscribe_cartridge.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/subscribe_cartridge.js
index 79000a2..e3eed2a 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/subscribe_cartridge.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/subscribe_cartridge.js
@@ -5,8 +5,8 @@ var render = function (theme, data, meta, require) {
partial: 'subscribe_cartridge',
context: {
title:data.name,
- autoScalePolicies:data.autoScalePolicies,
- deploymentPolicies:data.deploymentPolicies,
+ autoScalePolicies:data.autoScalePolicies.autoscalePolicy,
+ deploymentPolicies:data.deploymentPolicies.deploymentPolicy,
cartridgeType:meta.request.getParameter('cartridgeType')
}
}
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by pr...@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/f0b70784
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f0b70784
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f0b70784
Branch: refs/heads/master
Commit: f0b70784fa45f5d24a259cadc04013dad6165bdc
Parents: 1f2f9d0 8997301
Author: Pradeep Fernando <pr...@gmail.com>
Authored: Sun Jan 19 10:11:11 2014 +0530
Committer: Pradeep Fernando <pr...@gmail.com>
Committed: Sun Jan 19 10:11:11 2014 +0530
----------------------------------------------------------------------
.../stratos/autoscaler/PartitionContext.java | 12 +-
.../autoscaler/algorithm/OneAfterAnother.java | 20 +-
.../autoscaler/algorithm/RoundRobin.java | 159 ++++++-----
.../autoscaler/rule/RuleTasksDelegator.java | 8 +-
.../stratos/cartridge/agent/CartridgeAgent.java | 2 +
.../synchronizer/RepositoryInformation.java | 7 +
.../git/impl/GitBasedArtifactRepository.java | 45 +--
.../config/CartridgeAgentConfiguration.java | 14 +-
.../agent/util/CartridgeAgentConstants.java | 1 +
.../apache/stratos/manager/dto/Cartridge.java | 15 +-
.../listener/InstanceStatusListener.java | 2 +-
.../manager/lookup/ClusterIdToSubscription.java | 5 +-
.../manager/lookup/LookupDataHolder.java | 11 +-
.../manager/lookup/SubscriptionContext.java | 7 +-
.../lookup/TenantIdToSubscriptionContext.java | 2 +-
.../manager/CartridgeSubscriptionManager.java | 11 +-
.../DatabaseBasedPersistenceManager.java | 8 +-
.../manager/persistence/PersistenceManager.java | 4 +-
.../RegistryBasedPersistenceManager.java | 4 +-
.../DataInsertionAndRetrievalManager.java | 51 +++-
.../service/ApplicationManagementService.java | 2 +-
.../subscription/CartridgeSubscription.java | 10 +-
.../subscription/DataCartridgeSubscription.java | 28 +-
.../DataCartridgeSubscription_old.java | 8 +-
.../subscription/LBCartridgeSubscription.java | 9 +
.../factory/CartridgeSubscriptionFactory.java | 8 +-
.../StratosManagerTopologyReceiver.java | 2 +-
.../manager/test/CartridgeSubscriptionTest.java | 72 +++--
.../manager/test/LookupDataHolderTest.java | 282 +++++++++++++++++++
.../stratos/manager/test/PolicyHolderTest.java | 168 +++++------
.../rest/endpoint/services/ServiceUtils.java | 74 +++--
.../rest/endpoint/services/StratosAdmin.java | 2 +-
.../distribution/src/main/conf/scaling.drl | 18 +-
33 files changed, 752 insertions(+), 319 deletions(-)
----------------------------------------------------------------------