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/10 13:21:40 UTC
[1/3] git commit: updating console
Updated Branches:
refs/heads/master dd85cc287 -> a0d6ce5f3
updating console
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/ab00e0ae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ab00e0ae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ab00e0ae
Branch: refs/heads/master
Commit: ab00e0aeb031beeb38412ee36354efcc3d69306f
Parents: 8a76a55
Author: Pradeep Fernando <pr...@gmail.com>
Authored: Fri Jan 10 17:48:54 2014 +0530
Committer: Pradeep Fernando <pr...@gmail.com>
Committed: Fri Jan 10 17:48:54 2014 +0530
----------------------------------------------------------------------
.../controllers/cartridgeDefintionSubmit.jag | 8 ++++++++
.../theme1/partials/cartridge_deployments.hbs | 21 +++++++++++---------
.../console/util/utility.jag | 4 ++++
3 files changed, 24 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ab00e0ae/components/org.apache.stratos.manager.console/console/controllers/cartridgeDefintionSubmit.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/cartridgeDefintionSubmit.jag b/components/org.apache.stratos.manager.console/console/controllers/cartridgeDefintionSubmit.jag
new file mode 100644
index 0000000..c6dcd1c
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/controllers/cartridgeDefintionSubmit.jag
@@ -0,0 +1,8 @@
+<%
+(function(){
+ var log = new Log();
+ var utils = require('/util/utility.jag');
+ var cartridgeDefinition = request.getParameter("cartridge-definition").trim();
+ utils.consoleAppUtil.deployCartridgeDefinition(cartridgeDefinition);
+}());
+%>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ab00e0ae/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_deployments.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_deployments.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_deployments.hbs
index 76638f4..de0722d 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_deployments.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_deployments.hbs
@@ -9,16 +9,19 @@
<div class="row">
<div class="col-md-12">
<h2>Deploy New Cartridge</h2>
- <form role="form">
- <label for="policy" class="required">Policy Configuration</label>
- <div class="container">
- <div class="row">
- <div class="col-md-6 padding-remover-left">
- <textarea class="form-control" rows="11" id="policy"></textarea>
- <button type="button" class="btn btn-primary" id="deployPolicy">Deploy Cartridge</button>
- <a>Cancel</a>
- </div>
+ <form method="post" role="form" action="{{url "
+ /controllers/cartridgeDefintionSubmit.jag"}}">
+ <label for="policy" class="required">Policy Configuration</label>
+
+ <div class="container">
+ <div class="row">
+ <div class="col-md-6 padding-remover-left">
+ <textarea name="cartridge-definition" class="form-control" rows="11"
+ id="policy"></textarea>
+ <button type="submit" class="btn btn-primary" id="deployPolicy">Deploy Cartridge</button>
+ <a>Cancel</a>
+ </div>
<div class="col-md-6">
<i class="icons-help"></i>
Example configuration:
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ab00e0ae/components/org.apache.stratos.manager.console/console/util/utility.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/util/utility.jag b/components/org.apache.stratos.manager.console/console/util/utility.jag
index 42810c0..b0a5d55 100644
--- a/components/org.apache.stratos.manager.console/console/util/utility.jag
+++ b/components/org.apache.stratos.manager.console/console/util/utility.jag
@@ -89,6 +89,10 @@ consoleAppUtil = new function(){
return this.makeRequest("GET","/cartridge/list/subscribed",{}).data;
}
+ this.deployCartridgeDefinition = function(cartridgeDefintion){
+ return this.makeRequest("POST","/cartridge/definition",cartridgeDefintion).data;
+ };
+
this.makeRequest = function(httpMethod,urlPostFix,data){
var config = require('/config/console.js').config();
var backendServerURL = config.backendServerConfiguration.url;
[2/3] 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/ba213f57
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ba213f57
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ba213f57
Branch: refs/heads/master
Commit: ba213f577d0e2f1ea9a63c14ff7c26de97c72925
Parents: ab00e0a 4506c59
Author: Pradeep Fernando <pr...@gmail.com>
Authored: Fri Jan 10 17:49:21 2014 +0530
Committer: Pradeep Fernando <pr...@gmail.com>
Committed: Fri Jan 10 17:49:21 2014 +0530
----------------------------------------------------------------------
.../org.apache.stratos.autoscaler/pom.xml | 7 +
.../apache/stratos/autoscaler/Constants.java | 6 +
.../controller/InstanceNotificationClient.java | 71 ++++++
.../health/AutoscalerHealthStatReceiver.java | 245 +++++++++++++------
.../autoscaler/rule/RuleTasksDelegator.java | 10 +
.../stratos/cartridge/agent/CartridgeAgent.java | 51 ++--
.../agent/util/CartridgeAgentConstants.java | 1 +
.../cartridge/agent/util/ExtensionUtils.java | 13 +
.../stratos/manager/deploy/service/Service.java | 56 ++++-
.../service/ServiceDeploymentManager.java | 142 +++++++----
.../service/multitenant/MultiTenantService.java | 7 +-
.../multitenant/lb/MultiTenantLBService.java | 49 ++++
.../ServiceAlreadyDeployedException.java | 49 ++++
.../listener/InstanceStatusListener.java | 7 +
.../manager/CartridgeSubscriptionManager.java | 6 +-
.../InstanceNotificationPublisher.java | 13 +-
.../InstanceCleanupNotificationService.java | 9 +-
.../health/stat/AverageLoadAverageEvent.java | 8 +-
.../notifier/InstanceCleanupClusterEvent.java | 38 +++
.../instance/notifier/InstanceCleanupEvent.java | 47 ----
.../notifier/InstanceCleanupMemberEvent.java | 38 +++
.../InstanceCleanupClusterEventListener.java | 24 ++
.../notifier/InstanceCleanupEventListener.java | 25 --
.../InstanceCleanupMemberEventListener.java | 25 ++
...InstanceCleanupNotifierMessageProcessor.java | 6 +-
.../InstanceNotifierMessageProcessorChain.java | 4 +-
.../rest/endpoint/services/ServiceUtils.java | 28 ++-
.../rest/endpoint/services/StratosAdmin.java | 14 +-
.../AverageInFlightRequestsEventFormatter.xml | 2 +-
.../AverageLoadAverageEventFormatter.xml | 2 +-
.../AverageMemoryConsumptionEventFormatter.xml | 2 +-
.../FaultMessageEventFormatter.xml | 2 +-
.../GradientInFlightRequestsEventFormatter.xml | 2 +-
.../GradientLoadAverageEventFormatter.xml | 2 +-
.../GradientMemoryConsumptionEventFormatter.xml | 2 +-
.../MemberAverageLoadAverageEventFormatter.xml | 2 +-
...erAverageMemoryConsumptionEventFormatter.xml | 2 +-
.../MemberGradientLoadAverageEventFormatter.xml | 2 +-
...rGradientMemoryConsumptionEventFormatter.xml | 2 +-
...econdDerivativeLoadAverageEventFormatter.xml | 2 +-
...erivativeMemoryConsumptionEventFormatter.xml | 2 +-
...DerivativeInFlightRequestsEventFormatter.xml | 2 +-
...econdDerivativeLoadAverageEventFormatter.xml | 2 +-
...erivativeMemoryConsumptionEventFormatter.xml | 2 +-
.../pom.xml | 1 +
.../distribution/src/main/conf/autoscaler.xml | 5 +
.../distribution/src/main/conf/mincheck.drl | 2 +-
.../distribution/src/main/conf/scaling.drl | 52 ++--
.../distribution/src/main/extensions/clean.sh | 27 ++
.../pom.xml | 141 +++++++++++
.../InstanceCleanupNotificationService.wsdl | 91 +++++++
service-stubs/pom.xml | 1 +
tools/puppet/manifests/classes/lb_cartridge.pp | 133 ++++++++++
tools/puppet/manifests/classes/stratos.pp | 92 +++++++
tools/puppet/manifests/nodes.pp | 29 +++
tools/puppet/templates/load-balancer/.erb | 0
56 files changed, 1319 insertions(+), 286 deletions(-)
----------------------------------------------------------------------
[3/3] 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/a0d6ce5f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a0d6ce5f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a0d6ce5f
Branch: refs/heads/master
Commit: a0d6ce5f3210e62630f88c3d242c81600b0d7cb8
Parents: ba213f5 dd85cc2
Author: Pradeep Fernando <pr...@gmail.com>
Authored: Fri Jan 10 17:51:25 2014 +0530
Committer: Pradeep Fernando <pr...@gmail.com>
Committed: Fri Jan 10 17:51:25 2014 +0530
----------------------------------------------------------------------
.../SubscriptionMultiTenantBehaviour.java | 29 +++++++++++++++++---
1 file changed, 25 insertions(+), 4 deletions(-)
----------------------------------------------------------------------