You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by sa...@apache.org on 2014/03/23 15:33:02 UTC
[1/2] git commit: Applying patch given by Chanaka for STRATOS-555
Repository: incubator-stratos
Updated Branches:
refs/heads/master ca2e2c14d -> 78c83378e
Applying patch given by Chanaka for STRATOS-555
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/e8b164bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/e8b164bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/e8b164bf
Branch: refs/heads/master
Commit: e8b164bf80563c82ea7b24961edf222cb71d39fd
Parents: 6932793
Author: Sajith Kariyawasam <sa...@wso2.com>
Authored: Sun Mar 23 19:57:04 2014 +0530
Committer: Sajith Kariyawasam <sa...@wso2.com>
Committed: Sun Mar 23 19:57:04 2014 +0530
----------------------------------------------------------------------
.../themes/theme1/partials/cartridge_info.hbs | 46 ++++++++++----------
.../console/themes/theme1/partials/header.hbs | 10 ++---
.../theme1/partials/subscribe_cartridge.hbs | 29 +++++-------
.../themes/theme1/partials/tenant_new.hbs | 4 +-
.../themes/theme1/ui/js/tenant_management.js | 10 ++++-
5 files changed, 50 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e8b164bf/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_info.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_info.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_info.hbs
index 26bb78f..d20ae99 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_info.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_info.hbs
@@ -9,34 +9,32 @@
<div class="container">
<div class="row">
<div class="col-lg-12">
-
+
<div style="margin-bottom:20px;">{{cartridgeInfo.description}}</div>
- <div class="data-title">Access URLs:</div>
- <div>
- <a target="_blank" href="http://{{cartridgeInfo.cartridgeAlias}}.{{cartridgeInfo.hostName}}">http://{{cartridgeInfo.cartridgeAlias}}.{{cartridgeInfo.hostName}}</a>
- </div>
- <div>
- <a target="_blank" href="https://{{cartridgeInfo.cartridgeAlias}}.{{cartridgeInfo.hostName}}">https://{{cartridgeInfo.cartridgeAlias}}.{{cartridgeInfo.hostName}}</a>
- </div>
-
-
- <div class="data-title">ActiveInstances:</div>
+ <div class="data-title">Access URLs:</div>
+ {{#each cartridgeInfo.portMapping}}
+ <div>
+ <a target="_blank" href="{{protocol}}://{{../cartridgeInfo.hostName}}:{{proxyport}}">{{protocol}}://{{../cartridgeInfo.hostName}}:{{proxyport}}</a>
+ </div>
+ {{/each}}
+
+ <div class="data-title">ActiveInstances:</div>
<div>{{cartridgeInfo.activeInstances}}</div>
- <div class="data-title">CartridgeAlias:</div>
+ <div class="data-title">CartridgeAlias:</div>
<div>{{cartridgeInfo.cartridgeAlias}}</div>
- <div class="data-title">CartridgeType:</div>
+ <div class="data-title">CartridgeType:</div>
<div>{{cartridgeInfo.cartridgeType}}</div>
- <div class="data-title">HostName:</div>
+ <div class="data-title">HostName:</div>
<div>{{cartridgeInfo.hostName}}</div>
- <div class="data-title">Version:</div>
+ <div class="data-title">Version:</div>
<div>{{cartridgeInfo.version}}</div>
- <div class="data-title">Tenancy Model:</div>
+ <div class="data-title">Tenancy Model:</div>
{{#if cartridgeInfo.multiTenant}}
<div>true</div>
@@ -45,32 +43,32 @@
{{/if}}
- <div class="data-title">Provider:</div>
+ <div class="data-title">Provider:</div>
<div>{{cartridgeInfo.provider}}</div>
{{#if cartridgeInfo.repoURL }}
- <div class="data-title">RepoURL</div>
+ <div class="data-title">RepoURL</div>
<div>{{cartridgeInfo.repoURL}}</div>
{{/if}}
{{#ifCond cartridgeInfo.provider "==" "data"}}
- <div class="data-title">UserName</div>
+ <div class="data-title">UserName</div>
<div>{{cartridgeInfo.dbUserName}}</div>
- <div class="data-title">Password</div>
+ <div class="data-title">Password</div>
<div>{{cartridgeInfo.password}}</div>
{{/ifCond}}
{{#if clusterinfo.member}}
- <div class="data-title">Members Private ip(s):</div>
+ <div class="data-title">Members Private ip(s):</div>
<div>
{{#each clusterinfo.member}}
{{memberIp}}
{{/each}}
</div>
- <div class="data-title">Members Public ip(s):</div>
+ <div class="data-title">Members Public ip(s):</div>
<div>
{{#each clusterinfo.member}}
{{memberPublicIp}}
@@ -80,14 +78,14 @@
{{/if}}
{{#if lbclusterinfo.member}}
- <div class="data-title">LB Private ip:</div>
+ <div class="data-title">LB Private ip:</div>
<div>
{{#each lbclusterinfo.member}}
{{memberIp}};
{{/each}}
</div>
- <div class="data-title">LB Public ip:</div>
+ <div class="data-title">LB Public ip:</div>
<div>
{{#each lbclusterinfo.member}}
{{memberPublicIp}};
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e8b164bf/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
index 7e02db1..45b4f3a 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
@@ -19,7 +19,7 @@
</div>
<div class="col-lg-9 custom-nav">
<ul class="pull-left">
- <!-- li {{#if dashboard}} class="active" {{/if}}><a href="{{url "/dashboard.jag"}}"><i class="fa fa-dashboard"></i> <span><br>Dashboard</span></a></li -->
+ <!-- li {{#if dashboard}} class="active" {{/if}}><a href="{{url "/dashboard.jag"}}"><i class="fa fa-dashboard"></i> <span><br>Dashboard</span></a></li -->
<li {{#if my_cartridges}} class="active" {{/if}}><a href="{{url "/"}}"><i class="fa fa-tasks"></i> <span><br>My Cartridges</span></a></li>
{{#isAllowed "configure"}}<li {{#if configure_stratos}} class="active" {{/if}}><a href="{{url "/configure_stratos.jag"}}"><i class="fa fa-cogs"></i> <span><br>Configure Stratos</span></a></li>{{/isAllowed}}
{{#isAllowed "tenant-mgt"}}<li {{#if tenant_mgt}} class="active" {{/if}}><a href="{{url "/tenant_management.jag"}}"><i class="fa fa-user"></i> <span><br>Tenant Mgt</span></a></li>{{/isAllowed}}
@@ -28,7 +28,7 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-user"></i><br /> {{#user}}{{/user}} <b class="caret"></b></a>
<ul class="dropdown-menu">
- <!--li><a><i class="fa fa-file-text-o"></i> View Profile</a></li -->
+ <!--li><a><i class="fa fa-file-text-o"></i> View Profile</a></li -->
<li>
<a href="{{url "/controllers/logout.jag"}}"><i class="fa fa-sign-out"></i> logout</a>
</li>
@@ -49,12 +49,12 @@
<a class="btn {{button.class_name}}" href="{{url button.link }}"><i class="{{button.class_icon}}"></i> {{button.name}}</a>
</div>
{{#if has_action_buttons}}
- <div class="col-lg-4 action-buttons">
+ <div class="col-lg-4 action-buttons">
<button class="btn btn-default" onclick="manage_selected('activate')" type="button">Activate</button>
<button class="btn btn-default" onclick="manage_selected('deactivate')">Deactivate</button>
- <button class="btn btn-default" onclick="manage_selected('delete')">Delete</button>
+ <!--<button class="btn btn-default" onclick="manage_selected('delete')">Delete</button>-->
</div>
- <div class="col-lg-5 help-section">
+ <div class="col-lg-5 help-section">
{{#if has_help}}
<i class="icons-help"></i>
<p>{{help}}</p>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e8b164bf/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 8368fe0..0cd3518 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
@@ -9,15 +9,14 @@
<div class="container">
<div class="row">
<div class="col-lg-12">
- <form method="post" role="form" action="{{url "/controllers/cartridgeSubscribeSubmit.jag"}}" id="newTenantForm">
+ <form method="post" role="form" action="{{url "/controllers/cartridgeSubscribeSubmit.jag"}}" id="subscribeCartridgeForm">
<div class="form-group">
<label class="required">Public URL:</label>
<div class="form-inline">
<input name="cartridgeType" type="hidden" value="{{cartridgeType}}"/>
<input name="alias"
type="text"
- class="required"
- class="form-control input-xlarge js-help"
+ class="required form-control input-xlarge js-help"
data-help="Specify a unique alias which can be used to generate the hostname as alias.hostname from cartridge"
data-help-x-offset="50"
data-help-y-offset="10"
@@ -36,8 +35,7 @@
<div class="form-inline">
<input name="repoURL"
type="text"
- class="required"
- class="form-control input-xlarge js-help"
+ class="required form-control input-xlarge js-help"
data-help="Specify a repository URL of the artifacts."
data-help-x-offset="50"
data-help-y-offset="10"
@@ -54,13 +52,13 @@
<div class="form-group">
<label class="required">Username:</label>
<div class="form-inline">
- <input name="repoUsername" class="required" class="form-control input-xlarge" placeholder="username"/>
+ <input name="repoUsername" class="required form-control input-xlarge" placeholder="username"/>
</div>
</div>
<div class="form-group">
<label class="required">Password:</label>
<div class="form-inline">
- <input name="repoPassword" class="required" type="password" class="form-control input-xlarge" placeholder="******"/>
+ <input name="repoPassword" type="password" class="required form-control input-xlarge" placeholder="******"/>
</div>
</div>
</div>
@@ -146,14 +144,18 @@
{{/unless}}
{{/if}}
+ <div class="form-group">
+ <label class="required">New Checkbox:</label>
+ <label>
+ <input name="new_checkbox" type="checkbox" id="new_checkbox"/> Require Persistent Storage
+ </label>
+ </div>
<button type="submit" class="btn btn-primary">Subscribe to Cartridge</button>
</form>
</div>
</div>
</div>
-<script src="{{url "/themes/theme1/ui/js/utils.js"}}"></script>
-<script src="{{url "/themes/theme1/ui/js/tenant_management.js"}}"></script>
<script>
$(function(){
$('.js-help')
@@ -190,14 +192,7 @@
$volume_check.click(function(){
$('#persistence_container').toggle($volume_check.checked);
});
- });
-
- $('#alias').keyup(function(){
- if($(this).val() != ""){
- $('#domainMessage').show().html('Domain is not available').addClass('noDomain').removeClass('hasDomain');
- }
-
+ $( "#subscribeCartridgeForm" ).validate();
});
</script>
-<script src="{{url "/themes/theme1/ui/js/utils.js"}}"></script>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e8b164bf/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs
index f798846..2836b6e 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs
@@ -40,11 +40,11 @@
<div class="col-md-3 padding-remover-left">
<label class="required">Admin Password:</label>
- <input class="required" name="adminPassword" type="password"/>
+ <input class="required" name="adminPassword" id="adminPassword" type="password"/>
</div>
<div class="col-md-3">
<label class="required">Admin Password (Repeat):</label>
- <input class="required" type="password"/>
+ <input class="required" name="adminPassword_again" id="adminPassword_again" type="password"/>
</div>
<div class="clearfix"></div>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e8b164bf/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/tenant_management.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/tenant_management.js b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/tenant_management.js
index 3c37f33..50d07fa 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/tenant_management.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/tenant_management.js
@@ -7,7 +7,15 @@ $(function(){
}
});
- $('#newTenantForm').validate();
+ $( "#newTenantForm" ).validate({
+ rules: {
+ adminPassword: "required",
+ adminPassword_again: {
+ equalTo: "#adminPassword"
+ }
+ }
+ });
+
});
function manage_selected(action){
var checked = "";
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by sa...@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/78c83378
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/78c83378
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/78c83378
Branch: refs/heads/master
Commit: 78c83378ee1819a9f09073bfd30b660fcfab76b1
Parents: e8b164b ca2e2c1
Author: Sajith Kariyawasam <sa...@wso2.com>
Authored: Sun Mar 23 20:01:39 2014 +0530
Committer: Sajith Kariyawasam <sa...@wso2.com>
Committed: Sun Mar 23 20:01:39 2014 +0530
----------------------------------------------------------------------
.../InstanceNotificationPublisher.java | 1 -
.../modules/distribution/src/assembly/bin.xml | 83 +++
.../DefaultWSO2EventInputAdaptor.xml | 9 +
.../DefaultWSO2EventOutputAdaptor.xml | 8 +
.../src/main/conf/siddhi/siddhi.extension | 1 +
tools/stratos-installer/conf/stratos-setup.conf | 199 ++++++
.../repository/conf/activemq/jndi.properties | 28 +
tools/stratos-installer/stratos-db-clean.sh | 4 +
tools/stratos-installer/stratos-ec2.sh | 79 +++
tools/stratos-installer/stratos-openstack.sh | 69 ++
tools/stratos-installer/stratos-setup.sh | 651 +++++++++++++++++++
.../stratos-installer/stratos-start-servers.sh | 112 ++++
tools/stratos-installer/stratos-vcloud.sh | 69 ++
13 files changed, 1312 insertions(+), 1 deletion(-)
----------------------------------------------------------------------