You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2015/05/18 11:37:29 UTC
[1/4] stratos git commit: adding networkpartitions instead of
partitions as the menu
Repository: stratos
Updated Branches:
refs/heads/master 7629f8691 -> 29876f85f
adding networkpartitions instead of partitions as the menu
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/29876f85
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/29876f85
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/29876f85
Branch: refs/heads/master
Commit: 29876f85ff9c9b1f9f9a42860d98a64617a838ff
Parents: 27ae6d2
Author: reka <rt...@gmail.com>
Authored: Mon May 18 14:38:31 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Mon May 18 14:39:14 2015 +0530
----------------------------------------------------------------------
.../console/configure_form.jag | 8 +-
.../configure/configure_requests.jag | 8 +-
.../default/configure/networkpartitions.json | 17 ++++
.../forms/default/configure/partitions.json | 17 ----
.../schema/configure/networkpartitions.json | 94 ++++++++++++++++++++
.../forms/schema/configure/partitions.json | 94 --------------------
.../console/controllers/menu/menu.json | 2 +-
.../controllers/wizard/wizard_requests.jag | 4 +-
.../themes/theme0/partials/configure_form.hbs | 14 +--
.../console/wizard.jag | 4 +-
10 files changed, 131 insertions(+), 131 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/29876f85/components/org.apache.stratos.manager.console/console/configure_form.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/configure_form.jag b/components/org.apache.stratos.manager.console/console/configure_form.jag
index 0d17938..de828fd 100644
--- a/components/org.apache.stratos.manager.console/console/configure_form.jag
+++ b/components/org.apache.stratos.manager.console/console/configure_form.jag
@@ -84,7 +84,7 @@ if(isEdit == false && elements.action != 'new') {
switch (formtype) {
- case "partitions":
+ case "networkpartitions":
formTitle = "Network Partition",
buttonText = "Network Partition";
list_data = util.RESTCalls.getPartitions();
@@ -174,7 +174,7 @@ if (elements.action != 'new' && isEdit) {
formDataEdit = util.RESTCalls.getPolicyDeployment(id);
break;
- case "partitions":
+ case "networkpartitions":
formDataEdit = util.RESTCalls.getPartition(id);
break;
@@ -205,7 +205,7 @@ if(elements.action != 'new' && isUpdate){
id = escape(elements.action);
switch (formtype) {
- case "partitions":
+ case "networkpartitions":
formDataUpdate = util.RESTCalls.getPartition(id);
break;
case "autoscalingpolicies":
@@ -248,4 +248,4 @@ var caramelData = {
caramel.render(caramelData);
-%>
\ No newline at end of file
+%>
http://git-wip-us.apache.org/repos/asf/stratos/blob/29876f85/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag b/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag
index 3f9e24d..1982fe8 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag
+++ b/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag
@@ -30,7 +30,7 @@ include('/controllers/login/validator.jag');
try {
switch (formtype) {
- case "partitions":
+ case "networkpartitions":
formSubmit = util.RESTCalls.deployPartitionDefinition(formPayload);
break;
case "autoscalingpolicies":
@@ -57,7 +57,7 @@ try {
case "delete-applicationpolicies":
formSubmit = util.RESTCalls.deleteApplicationPolicyDefinition(formPayload);
break;
- case "delete-partitions":
+ case "delete-networkpartitions":
formSubmit = util.RESTCalls.deletePartiions(formPayload);
break;
case "delete-cartridge":
@@ -72,7 +72,7 @@ try {
case "delete-kubernetes-cluster":
formSubmit = util.RESTCalls.deleteKubernetesClusterDefinition(formPayload);
break;
- case "update-partitions":
+ case "update-networkpartitions":
formSubmit = util.RESTCalls.updatePartitionDefinition(formPayload);
break;
case "update-autoscalingpolicies":
@@ -97,4 +97,4 @@ try {
print(session.get("deploy-status"));
-%>
\ No newline at end of file
+%>
http://git-wip-us.apache.org/repos/asf/stratos/blob/29876f85/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/networkpartitions.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/networkpartitions.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/networkpartitions.json
new file mode 100644
index 0000000..0ad6424
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/networkpartitions.json
@@ -0,0 +1,17 @@
+{
+ "id": "network-partition-1",
+ "provider": "mock",
+ "partitions": [
+ {
+ "id": "partition-1",
+ "property": [
+ {
+ "name": "region",
+ "value": "default"
+ }
+ ]
+ }
+ ],
+ "properties": [
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/29876f85/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/partitions.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/partitions.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/partitions.json
deleted file mode 100644
index 0ad6424..0000000
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/partitions.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "id": "network-partition-1",
- "provider": "mock",
- "partitions": [
- {
- "id": "partition-1",
- "property": [
- {
- "name": "region",
- "value": "default"
- }
- ]
- }
- ],
- "properties": [
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/29876f85/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/networkpartitions.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/networkpartitions.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/networkpartitions.json
new file mode 100644
index 0000000..22d781a
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/networkpartitions.json
@@ -0,0 +1,94 @@
+{
+ "$schema": "http://json-schema.org/draft-04/schema#",
+ "id": "root",
+ "type": "object",
+ "title": "Network Partition Definition",
+ "name": "Network Partition Policy",
+ "options": {
+ "disable_properties": true,
+ "disable_collapse": true
+ },
+ "properties": {
+ "id": {
+ "id": "root/id",
+ "type": "string",
+ "title": "Network Partition Id"
+ },
+ "provider": {
+ "id": "root/provider",
+ "type": "string",
+ "title": "Network Partition provider",
+ "enum": ["mock", "ec2", "openstack", "kubernetes", "gce"]
+ },
+ "partitions": {
+ "id": "root/partitions",
+ "type": "array",
+ "format": "tabs",
+ "title": "Partitions",
+ "items": {
+ "id": "root/partitions/0",
+ "type": "object",
+ "title": "Partition",
+ "properties": {
+ "id": {
+ "id": "root/partitions/0/id",
+ "type": "string",
+ "title": "Partition Id"
+ },
+ "property": {
+ "id": "root/partitions/0/property",
+ "type": "array",
+ "title": "Property",
+ "format": "tabs",
+ "items": {
+ "id": "root/partitions/0/property/0",
+ "type": "object",
+ "title": "Property",
+ "properties": {
+ "name": {
+ "id": "root/partitions/0/property/0/name",
+ "title": "Name",
+ "type": "string"
+ },
+ "value": {
+ "id": "root/partitions/0/property/0/value",
+ "title": "Value",
+ "type": "string"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "properties": {
+ "id": "root/properties",
+ "type": "array",
+ "title": "Properties",
+ "format": "tabs",
+ "items": {
+ "id": "root/properties/0",
+ "type": "object",
+ "title": "Property",
+ "properties": {
+ "name": {
+ "id": "root/properties/0/name",
+ "title": "Name",
+ "type": "string"
+ },
+ "value": {
+ "id": "root/properties/0/value",
+ "title": "Value",
+ "type": "string"
+ }
+ }
+ }
+ }
+ },
+
+ "required": [
+ "id",
+ "partitions",
+ "provider"
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/29876f85/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/partitions.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/partitions.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/partitions.json
deleted file mode 100644
index 22d781a..0000000
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/partitions.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-04/schema#",
- "id": "root",
- "type": "object",
- "title": "Network Partition Definition",
- "name": "Network Partition Policy",
- "options": {
- "disable_properties": true,
- "disable_collapse": true
- },
- "properties": {
- "id": {
- "id": "root/id",
- "type": "string",
- "title": "Network Partition Id"
- },
- "provider": {
- "id": "root/provider",
- "type": "string",
- "title": "Network Partition provider",
- "enum": ["mock", "ec2", "openstack", "kubernetes", "gce"]
- },
- "partitions": {
- "id": "root/partitions",
- "type": "array",
- "format": "tabs",
- "title": "Partitions",
- "items": {
- "id": "root/partitions/0",
- "type": "object",
- "title": "Partition",
- "properties": {
- "id": {
- "id": "root/partitions/0/id",
- "type": "string",
- "title": "Partition Id"
- },
- "property": {
- "id": "root/partitions/0/property",
- "type": "array",
- "title": "Property",
- "format": "tabs",
- "items": {
- "id": "root/partitions/0/property/0",
- "type": "object",
- "title": "Property",
- "properties": {
- "name": {
- "id": "root/partitions/0/property/0/name",
- "title": "Name",
- "type": "string"
- },
- "value": {
- "id": "root/partitions/0/property/0/value",
- "title": "Value",
- "type": "string"
- }
- }
- }
- }
- }
- }
- },
- "properties": {
- "id": "root/properties",
- "type": "array",
- "title": "Properties",
- "format": "tabs",
- "items": {
- "id": "root/properties/0",
- "type": "object",
- "title": "Property",
- "properties": {
- "name": {
- "id": "root/properties/0/name",
- "title": "Name",
- "type": "string"
- },
- "value": {
- "id": "root/properties/0/value",
- "title": "Value",
- "type": "string"
- }
- }
- }
- }
- },
-
- "required": [
- "id",
- "partitions",
- "provider"
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/29876f85/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json b/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json
index 2e50c5e..6bea2fb 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json
@@ -10,7 +10,7 @@
"description": "Configure Auto-scaling policies, cartridges and manage docker groups",
"sub-menu": [
{
- "link": "configure/partitions/",
+ "link": "configure/networkpartitions/",
"linkexternal": false,
"context": "/configure",
"title": "Network Partitions",
http://git-wip-us.apache.org/repos/asf/stratos/blob/29876f85/components/org.apache.stratos.manager.console/console/controllers/wizard/wizard_requests.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/wizard/wizard_requests.jag b/components/org.apache.stratos.manager.console/console/controllers/wizard/wizard_requests.jag
index decbdf5..1ba0997 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/wizard/wizard_requests.jag
+++ b/components/org.apache.stratos.manager.console/console/controllers/wizard/wizard_requests.jag
@@ -29,7 +29,7 @@ var log = new Log("apachestratos.configure_request"),
include('/controllers/login/validator.jag');
try {
- if(formtype == 'partitions'){
+ if(formtype == 'networkpartitions'){
formSubmit = util.RESTCalls.deployPartitionDefinition(formPayload);
}else if(formtype == 'autoscalingpolicies'){
formSubmit = util.RESTCalls.deployAutoscalePolicyDefinition(formPayload);
@@ -50,4 +50,4 @@ try {
print(session.get("deploy-status"));
-%>
\ No newline at end of file
+%>
http://git-wip-us.apache.org/repos/asf/stratos/blob/29876f85/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
index b4bc3c4..42757d2 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
@@ -240,7 +240,7 @@
</div>
{{/each}}
{{/ifCond}}
- {{#ifCond formtype "==" "partitions"}}
+ {{#ifCond formtype "==" "networkpartitions"}}
{{#each content_body.sections}}
<div class="block col-md-4 col-xs-4 grid-group-item border-right">
<div class="toggle-menu-icon">
@@ -251,23 +251,23 @@
<div class="toggle-menu-description">{{description}}</div>
<div class="list-button" style="display: none;">
<button class="btn btn-danger btn-lg hover-delete" type="button"
- id="{{id}}" data-formtype="delete-partitions"> Delete</button>
+ id="{{id}}" data-formtype="delete-networkpartitions"> Delete</button>
<button class="btn btn-warning btn-lg hover-details" type="button" id="details_list_{{id}}"
- data-url="{{url ""}}/configure/partitions/{{id}}/edit" > Edit
+ data-url="{{url ""}}/configure/networkpartitions/{{id}}/edit" > Edit
</button>
<button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}"
- data-url="{{url ""}}/configure/partitions/{{id}}/" > Details
+ data-url="{{url ""}}/configure/networkpartitions/{{id}}/" > Details
</button>
</div>
<div class="bottom-bar-wrapper">
<div class="bottom-bar">
<button class="btn btn-danger btn-lg hover-delete" type="button"
- id="{{id}}" data-formtype="delete-partitions"> Delete</button>
+ id="{{id}}" data-formtype="delete-networkpartitions"> Delete</button>
<button class="btn btn-warning btn-lg hover-details" type="button" id="details_list_{{id}}"
- data-url="{{url ""}}/configure/partitions/{{id}}/edit" > Edit
+ data-url="{{url ""}}/configure/networkpartitions/{{id}}/edit" > Edit
</button>
<button class="btn btn-info btn-lg hover-details" type="button" id="details_{{id}}"
- data-url="{{url ""}}/configure/partitions/{{id}}/" > Details
+ data-url="{{url ""}}/configure/networkpartitions/{{id}}/" > Details
</button>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/stratos/blob/29876f85/components/org.apache.stratos.manager.console/console/wizard.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/wizard.jag b/components/org.apache.stratos.manager.console/console/wizard.jag
index 232b939..4db2b76 100644
--- a/components/org.apache.stratos.manager.console/console/wizard.jag
+++ b/components/org.apache.stratos.manager.console/console/wizard.jag
@@ -43,7 +43,7 @@ if(elements==null){
}
var vm = {
- '1':'partitions',
+ '1':'networkpartitions',
'2':'autoscalingpolicies',
'3':'deployments',
'4':'loadbalancer',
@@ -112,4 +112,4 @@ caramel.render({
error: error
});
-%>
\ No newline at end of file
+%>
[4/4] stratos git commit: fixing NULL conversion issue
Posted by re...@apache.org.
fixing NULL conversion issue
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f6ef5fff
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f6ef5fff
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f6ef5fff
Branch: refs/heads/master
Commit: f6ef5fff9d603b0f4d4538d009f6e5567182b76a
Parents: 7629f86
Author: reka <rt...@gmail.com>
Authored: Mon May 18 12:31:43 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Mon May 18 14:39:14 2015 +0530
----------------------------------------------------------------------
.../stratos/rest/endpoint/util/converter/ObjectConverter.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/f6ef5fff/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
index 6f54d94..921bfdc 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
@@ -1592,7 +1592,11 @@ public class ObjectConverter {
cartridge.setMultiTenant(cartridgeInfo.getMultiTenant());
cartridge.setDescription(cartridgeInfo.getDescription());
cartridge.setLoadBalancingIPType(cartridgeInfo.getLoadBalancingIPType());
- cartridge.setMetadataKeys(cartridgeInfo.getMetadataKeys());
+
+ if(cartridgeInfo.getMetadataKeys() != null && cartridgeInfo.getMetadataKeys()[0] != null) {
+ cartridge.setMetadataKeys(cartridgeInfo.getMetadataKeys());
+ }
+
cartridge.setTenantPartitions(cartridgeInfo.getTenantPartitions());
//convert persistence
[3/4] stratos git commit: adding properties to network parttition in
UI
Posted by re...@apache.org.
adding properties to network parttition in UI
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/27ae6d22
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/27ae6d22
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/27ae6d22
Branch: refs/heads/master
Commit: 27ae6d224746ca9d86eefd65de46daf14f949925
Parents: d54fab1
Author: reka <rt...@gmail.com>
Authored: Mon May 18 13:03:35 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Mon May 18 14:39:14 2015 +0530
----------------------------------------------------------------------
.../forms/default/configure/partitions.json | 2 +
.../forms/schema/configure/partitions.json | 48 +++++++++++++++-----
2 files changed, 38 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/27ae6d22/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/partitions.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/partitions.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/partitions.json
index 466da28..0ad6424 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/partitions.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/partitions.json
@@ -11,5 +11,7 @@
}
]
}
+ ],
+ "properties": [
]
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/27ae6d22/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/partitions.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/partitions.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/partitions.json
index 0e2b65c..22d781a 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/partitions.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/partitions.json
@@ -2,7 +2,7 @@
"$schema": "http://json-schema.org/draft-04/schema#",
"id": "root",
"type": "object",
- "title":"Network Partition Definition",
+ "title": "Network Partition Definition",
"name": "Network Partition Policy",
"options": {
"disable_properties": true,
@@ -12,47 +12,47 @@
"id": {
"id": "root/id",
"type": "string",
- "title":"Network Partition Id"
+ "title": "Network Partition Id"
},
"provider": {
"id": "root/provider",
"type": "string",
- "title":"Network Partition provider",
+ "title": "Network Partition provider",
"enum": ["mock", "ec2", "openstack", "kubernetes", "gce"]
},
"partitions": {
"id": "root/partitions",
"type": "array",
- "format":"tabs",
- "title":"Partitions",
+ "format": "tabs",
+ "title": "Partitions",
"items": {
"id": "root/partitions/0",
"type": "object",
- "title":"Partition",
+ "title": "Partition",
"properties": {
"id": {
"id": "root/partitions/0/id",
"type": "string",
- "title":"Partition Id"
+ "title": "Partition Id"
},
"property": {
"id": "root/partitions/0/property",
"type": "array",
- "title":"Property",
- "format":"tabs",
+ "title": "Property",
+ "format": "tabs",
"items": {
"id": "root/partitions/0/property/0",
"type": "object",
- "title":"Property",
+ "title": "Property",
"properties": {
"name": {
"id": "root/partitions/0/property/0/name",
- "title":"Name",
+ "title": "Name",
"type": "string"
},
"value": {
"id": "root/partitions/0/property/0/value",
- "title":"Value",
+ "title": "Value",
"type": "string"
}
}
@@ -60,8 +60,32 @@
}
}
}
+ },
+ "properties": {
+ "id": "root/properties",
+ "type": "array",
+ "title": "Properties",
+ "format": "tabs",
+ "items": {
+ "id": "root/properties/0",
+ "type": "object",
+ "title": "Property",
+ "properties": {
+ "name": {
+ "id": "root/properties/0/name",
+ "title": "Name",
+ "type": "string"
+ },
+ "value": {
+ "id": "root/properties/0/value",
+ "title": "Value",
+ "type": "string"
+ }
+ }
+ }
}
},
+
"required": [
"id",
"partitions",
[2/4] stratos git commit: Removing metadata keys
Posted by re...@apache.org.
Removing metadata keys
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d54fab10
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d54fab10
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d54fab10
Branch: refs/heads/master
Commit: d54fab101818c6e2b2c1604b0f9e043391e7a93f
Parents: f6ef5ff
Author: reka <rt...@gmail.com>
Authored: Mon May 18 12:37:50 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Mon May 18 14:39:14 2015 +0530
----------------------------------------------------------------------
.../stratos/common/beans/cartridge/CartridgeBean.java | 10 ----------
.../rest/endpoint/util/converter/ObjectConverter.java | 6 +++---
2 files changed, 3 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d54fab10/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java
index 9bd9e78..7f41830 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java
@@ -47,7 +47,6 @@ public class CartridgeBean {
* Load balancing ip type: public|private
*/
private String loadBalancingIPType;
- private String[] metadataKeys;
private List<PropertyBean> property;
private String getDeploymentDetails() {
@@ -209,14 +208,6 @@ public class CartridgeBean {
this.loadBalancingIPType = loadBalancingIPType;
}
- public String[] getMetadataKeys() {
- return metadataKeys;
- }
-
- public void setMetadataKeys(String[] metadataKeys) {
- this.metadataKeys = metadataKeys;
- }
-
public String toString() {
return "Type: " + getType() +
@@ -233,7 +224,6 @@ public class CartridgeBean {
", IaaS Providers: " + getIaasProviders() +
", Persistence " + (getPersistence() == null ? "" : getPersistence().toString()) +
", Load Balancing IP Type: " + getLoadBalancingIPType() +
- ", Metadata Keys: " + getMetadataKeys() +
", Properties: " + getProperties();
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/d54fab10/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
index 921bfdc..3add8f8 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
@@ -80,7 +80,7 @@ public class ObjectConverter {
cartridge.setDescription(cartridgeBean.getDescription());
cartridge.setTenantPartitions(cartridgeBean.getTenantPartitions());
cartridge.setLoadBalancingIPType(cartridgeBean.getLoadBalancingIPType());
- cartridge.setMetadataKeys(cartridgeBean.getMetadataKeys());
+ //cartridge.setMetadataKeys(cartridgeBean.getMetadataKeys());
// deployment information
if (cartridgeBean.getDeployment() != null) {
@@ -1593,9 +1593,9 @@ public class ObjectConverter {
cartridge.setDescription(cartridgeInfo.getDescription());
cartridge.setLoadBalancingIPType(cartridgeInfo.getLoadBalancingIPType());
- if(cartridgeInfo.getMetadataKeys() != null && cartridgeInfo.getMetadataKeys()[0] != null) {
+ /*if(cartridgeInfo.getMetadataKeys() != null && cartridgeInfo.getMetadataKeys()[0] != null) {
cartridge.setMetadataKeys(cartridgeInfo.getMetadataKeys());
- }
+ }*/
cartridge.setTenantPartitions(cartridgeInfo.getTenantPartitions());