You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2014/12/22 07:29:17 UTC
[11/14] stratos git commit: remove unwanted JSON Schemas and deafults
remove unwanted JSON Schemas and deafults
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/760109a6
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/760109a6
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/760109a6
Branch: refs/heads/master
Commit: 760109a6eaf7100e104a4e348c9f65ea43aa2645
Parents: ddb0b10
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Mon Dec 22 11:25:15 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Dec 22 11:58:58 2014 +0530
----------------------------------------------------------------------
.../forms/default/configure/application.json | 1 -
.../forms/default/configure/loadbalancer.json | 46 ----
.../forms/default/configure/multitenant.json | 10 -
.../forms/default/configure/partitions.json | 16 --
.../forms/schema/configure/application.json | 1 -
.../forms/schema/configure/loadbalancer.json | 263 -------------------
.../forms/schema/configure/multitenant.json | 71 -----
.../forms/schema/configure/partitions.json | 89 -------
8 files changed, 497 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/760109a6/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/application.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/application.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/application.json
deleted file mode 100644
index 9e26dfe..0000000
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/application.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/760109a6/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/loadbalancer.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/loadbalancer.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/loadbalancer.json
deleted file mode 100644
index 5379db2..0000000
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/loadbalancer.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "type":"lb",
- "isPublic":false,
- "provider":"lb",
- "host":"stratos.org",
- "displayName":"load balancer",
- "description":"LB Cartridge",
- "version":"4",
- "defaultAutoscalingPolicy":"economyPolicy",
- "portMapping":[
- {
- "protocol":"http",
- "port":"8280",
- "proxyPort":"8280"
- },
- {
- "protocol":"https",
- "port":"8243",
- "proxyPort":"8243"
- }
- ],
- "iaasProvider":[
- {
- "type":"ec2",
- "imageId":"ap-southeast-1/ami-70326522",
- "maxInstanceLimit":"5",
- "property":[
- {
- "name":"instanceType",
- "value":"m1.medium"
- },
- {
- "name":"keyPair",
- "value":"xxxxxx"
- }
- ]
- }
- ],
-
- "property":[
- {
- "name":"load.balancer",
- "value":"true"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/760109a6/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/multitenant.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/multitenant.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/multitenant.json
deleted file mode 100644
index 4d5d423..0000000
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/multitenant.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "serviceName": "appserver",
- "isPublic":"true",
- "cartridgeType": "appserver",
- "deploymentPolicyName": "D1",
- "autoscalingPolicyName": "AS1",
- "clusterDomain": "appserverdev.dev.domain",
- "clusterSubDomain": "subdomain2",
- "tenantRange": "*"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/760109a6/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 a970f29..0000000
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/partitions.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "id": "P1",
- "description":"partition description",
- "isPublic":false,
- "provider": "ec2",
- "property": [
- {
- "name": "region",
- "value": "ap-southeast-1"
- },
- {
- "name": "zone",
- "value": "ap-southeast-1a"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/760109a6/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/application.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/application.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/application.json
deleted file mode 100644
index 9e26dfe..0000000
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/application.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/760109a6/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/loadbalancer.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/loadbalancer.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/loadbalancer.json
deleted file mode 100644
index 42ba217..0000000
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/loadbalancer.json
+++ /dev/null
@@ -1,263 +0,0 @@
-{
- "type": "object",
- "$schema": "http://json-schema.org/draft-04/schema",
- "id": "root",
- "title": "Load Balancer Definition",
- "name": "Load Balancer",
- "options": {
- "disable_properties": true,
- "disable_collapse": true
- },
- "required": ["type", "provider", "host", "displayName", "description", "version", "portMapping"],
- "properties": {
- "type": {
- "type": "string",
- "id": "root/type",
- "title": "Type",
- "name": "Type",
- "default": "lb",
- "propertyOrder": 1,
- "maxItems": 1
- },
- "isPublic": {
- "type": "boolean",
- "id": "root/isPublic",
- "title": "Is Public",
- "name": "Is Public",
- "default": false,
- "propertyOrder": 2,
- "maxItems": 1
- },
- "provider": {
- "type": "string",
- "id": "root/provider",
- "title": "Provider",
- "name": "Provider",
- "default": "lb",
- "propertyOrder": 3,
- "maxItems": 1
- },
- "host": {
- "type": "string",
- "id": "root/host",
- "title": "Host",
- "name": "Host",
- "default": "stratos.org",
- "propertyOrder": 4,
- "maxItems": 1
- },
- "displayName": {
- "type": "string",
- "id": "root/displayName",
- "title": "Display Name",
- "name": "Display Name",
- "default": "load balancer",
- "propertyOrder": 5,
- "maxItems": 1
- },
- "description": {
- "type": "string",
- "id": "root/description",
- "title": "Description",
- "name": "Description",
- "default": "LB Cartridge",
- "propertyOrder": 6,
- "maxItems": 1
- },
- "version": {
- "type": "string",
- "id": "root/version",
- "title": "Version",
- "name": "Version",
- "default": "4",
- "propertyOrder": 7,
- "maxItems": 1
- },
- "defaultAutoscalingPolicy": {
- "type": "string",
- "id": "root/defaultAutoscalingPolicy",
- "title": "Default Autoscaling Policy",
- "name": "Default Autoscaling Policy",
- "default": "economyPolicy",
- "required": false
- },
- "portMapping": {
- "type": "array",
- "id": "root/portMapping",
- "title": "Port Mapping",
- "name": "Port Mapping",
- "items": [
- {
- "type": "object",
- "id": "root/portMapping/0",
- "required": ["port", "protocol", "proxyPort"],
- "format": "grid",
- "properties": {
- "protocol": {
- "type": "string",
- "id": "root/portMapping/0/protocol",
- "title": "Protocol",
- "name": "Protocol",
- "default": "http"
- },
- "port": {
- "type": "number",
- "id": "root/portMapping/0/port",
- "title": "Port",
- "name": "Port",
- "default": "8280",
- "format": "number"
- },
- "proxyPort": {
- "type": "number",
- "id": "root/portMapping/0/proxyPort",
- "title": "Proxy Port",
- "name": "Proxy Port",
- "default": "8280",
- "format": "number"
- }
- }
- },
- {
- "type": "object",
- "id": "root/portMapping/1",
- "required": false,
- "format": "grid",
- "properties": {
- "protocol": {
- "type": "string",
- "id": "root/portMapping/1/protocol",
- "title": "Protocol",
- "name": "Protocol",
- "default": "https"
- },
- "port": {
- "type": "number",
- "id": "root/portMapping/1/port",
- "title": "Port",
- "name": "Port",
- "default": "8243",
- "format": "number"
- },
- "proxyPort": {
- "type": "number",
- "id": "root/portMapping/1/proxyPort",
- "title": "Proxy Port",
- "name": "Proxy Port",
- "default": "8243",
- "format": "number"
- }
- }
- }
- ]
- },
- "iaasProvider": {
- "type": "array",
- "id": "root/iaasProvider",
- "title": "iaas Provider",
- "name": "iaas Provider",
- "required": false,
- "items": {
- "type": "object",
- "id": "root/iaasProvider/0",
- "format": "grid",
- "required": ["type", "imageId", "maxInstanceLimit"],
- "properties": {
- "type": {
- "type": "string",
- "id": "root/iaasProvider/0/type",
- "title": "Type",
- "name": "Type",
- "default": "ec2"
- },
- "imageId": {
- "type": "string",
- "id": "root/iaasProvider/0/imageId",
- "title": "Image ID",
- "name": "Image ID",
- "default": "ap-southeast-1/ami-70326522"
- },
- "maxInstanceLimit": {
- "type": "number",
- "id": "root/iaasProvider/0/maxInstanceLimit",
- "title": "Max Instance Limit",
- "name": "Max Instance Limit",
- "default": "5",
- "format": "number"
- },
- "property": {
- "type": "array",
- "id": "root/iaasProvider/0/property",
- "required": false,
- "items": [
- {
- "type": "object",
- "id": "root/iaasProvider/0/property/0",
- "format": "grid",
- "required": ["name", "value"],
- "properties": {
- "name": {
- "type": "string",
- "id": "root/iaasProvider/0/property/0/name",
- "default": "instanceType"
- },
- "value": {
- "type": "string",
- "id": "root/iaasProvider/0/property/0/value",
- "default": "m1.medium"
- }
- }
- },
- {
- "type": "object",
- "id": "root/iaasProvider/0/property/1",
- "required": false,
- "format": "grid",
- "properties": {
- "name": {
- "type": "string",
- "id": "root/iaasProvider/0/property/1/name",
- "default": "keyPair",
- "required": false
- },
- "value": {
- "type": "string",
- "id": "root/iaasProvider/0/property/1/value",
- "default": "xxxxxx",
- "required": false
- }
- }
- }
- ]
- }
- }
- }
-
-
- },
- "property": {
- "type": "array",
- "id": "root/property",
- "required": false,
- "items": {
- "type": "object",
- "id": "root/property/0",
- "required": false,
- "properties": {
- "name": {
- "type": "string",
- "id": "root/property/0/name",
- "default": "load.balancer",
- "required": false
- },
- "value": {
- "type": "string",
- "id": "root/property/0/value",
- "default": "true",
- "required": false
- }
- }
- }
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/760109a6/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/multitenant.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/multitenant.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/multitenant.json
deleted file mode 100644
index 31616e5..0000000
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/multitenant.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
- "type":"object",
- "$schema": "http://json-schema.org/draft-04/schema",
- "id": "root",
- "title": "Multi-Tenant Service Definition",
- "name": "Service Definition",
- "options": {
- "disable_properties": true,
- "disable_collapse": true
- },
- "required":["serviceName","cartridgeType","deploymentPolicyName","autoscalingPolicyName","clusterDomain",
- "clusterSubDomain","tenantRange"],
- "properties":{
- "serviceName": {
- "type":"string",
- "id": "root/serviceName",
- "title": "Service Name",
- "name": "Service Name",
- "default": "appserver"
- },
- "isPublic": {
- "type":"string",
- "id": "root/isPublic",
- "title": "Is Public",
- "name": "Is Public",
- "default": "true"
- },
- "cartridgeType": {
- "type":"string",
- "id": "root/cartridgeType",
- "title": "Cartridge Type",
- "name": "Cartridge Type",
- "default": "appserver"
- },
- "deploymentPolicyName": {
- "type":"string",
- "id": "root/deploymentPolicyName",
- "title": "Deployment Policy Name",
- "name": "Deployment Policy Name",
- "default": "D1"
- },
- "autoscalingPolicyName": {
- "type":"string",
- "id": "root/autoscalingPolicyName",
- "title": "Autoscaling Policy Name",
- "name": "Autoscaling Policy Name",
- "default": "AS1"
- },
- "clusterDomain": {
- "type":"string",
- "id": "root/clusterDomain",
- "title": "Cluster Domain",
- "name": "Cluster Domain",
- "default": "appserverdev.dev.domain"
- },
- "clusterSubDomain": {
- "type":"string",
- "id": "root/clusterSubDomain",
- "title": "Cluster Sub Domain",
- "name": "Cluster Sub Domain",
- "default": "subdomain2"
- },
- "tenantRange": {
- "type":"string",
- "title": "Tenant Range",
- "name": "Tenant Range",
- "id": "root/tenantRange",
- "default": "*"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/760109a6/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 1209c93..0000000
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/partitions.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
- "type":"object",
- "$schema": "http://json-schema.org/draft-04/schema",
- "id": "root",
- "title": "Partition Definition",
- "name": "Partition",
- "options": {
- "disable_properties": true,
- "disable_collapse": true
- },
- "required" : ["id","provider","property"],
- "properties":{
- "id": {
- "type":"string",
- "title": "Partition ID",
- "name": "Partition ID",
- "id": "root/id",
- "default": "P1",
- "maxItems":1
- },
- "description": {
- "type":"string",
- "id": "root/description",
- "title": "Description",
- "name": "Description",
- "maxItems":1
- },
- "isPublic": {
- "type":"boolean",
- "id": "root/isPublic",
- "title": "Is Public",
- "name": "Is Public",
- "default": false,
- "maxItems":1
- },
- "provider": {
- "type":"string",
- "id": "root/provider",
- "title": "Provider",
- "name": "Provider",
- "default": "ec2",
- "enum": ["ec2", "openstack", "vcloud"],
- },
- "property": {
- "readonly":true,
- "type":"array",
- "id": "root/property",
- "items":[
- {
- "type":"object",
- "id": "root/property/0",
- "format": "grid",
- "required":["name", "value"],
- "properties":{
- "name": {
- "type":"string",
- "id": "root/property/0/name",
- "default": "region"
- },
- "value": {
- "type":"string",
- "id": "root/property/0/value",
- "default": "ap-southeast-1"
- }
- }
- },
- {
- "type":"object",
- "id": "root/property/1",
- "format": "grid",
- "properties":{
- "name": {
- "type":"string",
- "id": "root/property/1/name",
- "default": "zone"
- },
- "value": {
- "type":"string",
- "id": "root/property/1/value",
- "default": "ap-southeast-1a"
-
- }
- }
- }
- ]
-
- }
- }
-}
\ No newline at end of file