You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/03/17 18:59:29 UTC
[08/50] [abbrv] stratos git commit: Remove maxInstanceLimit from
cartridge json and schema
Remove maxInstanceLimit from cartridge json and schema
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/50ce2997
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/50ce2997
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/50ce2997
Branch: refs/heads/master-deployment-policy-fix-merge
Commit: 50ce2997a76a40c18884280bee3a128d60384588
Parents: 2b600ea
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Thu Mar 12 21:53:55 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Thu Mar 12 21:53:55 2015 +0530
----------------------------------------------------------------------
.../stratos/cloud/controller/util/CloudControllerConstants.java | 1 -
.../src/main/resources/cartridge.xsd | 2 --
.../src/main/resources/cartridges.xsd | 2 --
.../src/main/webapp/api-test/WEB-INF/schemas/schema.xsd | 1 -
.../src/main/webapp/api/WEB-INF/schemas/schema.xsd | 1 -
5 files changed, 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/50ce2997/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
index 9eb52c8..b55bc7f 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
@@ -61,7 +61,6 @@ public final class CloudControllerConstants {
public static final String SCALE_DOWN_ORDER_ELEMENT = "scaleDownOrder";
public static final String SCALE_UP_ORDER_ELEMENT = "scaleUpOrder";
public static final String CLASS_NAME_ELEMENT = "className";
- public static final String MAX_INSTANCE_LIMIT_ELEMENT = "maxInstanceLimit";
public static final String PROVIDER_ELEMENT = "provider";
public static final String IDENTITY_ELEMENT = "identity";
public static final String TYPE_ELEMENT = "type";
http://git-wip-us.apache.org/repos/asf/stratos/blob/50ce2997/components/org.apache.stratos.cloud.controller/src/main/resources/cartridge.xsd
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/resources/cartridge.xsd b/components/org.apache.stratos.cloud.controller/src/main/resources/cartridge.xsd
index c598431..83833e5 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/resources/cartridge.xsd
+++ b/components/org.apache.stratos.cloud.controller/src/main/resources/cartridge.xsd
@@ -62,8 +62,6 @@
minOccurs="0" maxOccurs="1" />
<xs:element type="xs:string" name="scaleDownOrder"
minOccurs="0" maxOccurs="1" />
- <xs:element type="xs:string" name="maxInstanceLimit"
- minOccurs="0" maxOccurs="1" />
<xs:element type="xs:string" name="imageId"
minOccurs="0" maxOccurs="1" />
<xs:element name="property"
http://git-wip-us.apache.org/repos/asf/stratos/blob/50ce2997/components/org.apache.stratos.cloud.controller/src/main/resources/cartridges.xsd
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/resources/cartridges.xsd b/components/org.apache.stratos.cloud.controller/src/main/resources/cartridges.xsd
index 4d7cefc..894125d 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/resources/cartridges.xsd
+++ b/components/org.apache.stratos.cloud.controller/src/main/resources/cartridges.xsd
@@ -74,8 +74,6 @@
minOccurs="0" maxOccurs="1" />
<xs:element type="xs:string" name="scaleDownOrder"
minOccurs="0" maxOccurs="1" />
- <xs:element type="xs:string" name="maxInstanceLimit"
- minOccurs="0" maxOccurs="1" />
<xs:element type="xs:string" name="imageId"
minOccurs="0" maxOccurs="1" />
<xs:element name="property"
http://git-wip-us.apache.org/repos/asf/stratos/blob/50ce2997/components/org.apache.stratos.rest.endpoint/src/main/webapp/api-test/WEB-INF/schemas/schema.xsd
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api-test/WEB-INF/schemas/schema.xsd b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api-test/WEB-INF/schemas/schema.xsd
index 9fb25d2..b45474a 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api-test/WEB-INF/schemas/schema.xsd
+++ b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api-test/WEB-INF/schemas/schema.xsd
@@ -127,7 +127,6 @@
<xs:sequence>
<xs:element name="type" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
<xs:element name="imageId" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
- <xs:element name="maxInstanceLimit" type="xs:int" minOccurs="1" maxOccurs="1" nillable="false"/>
<xs:element name="property" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:all>
http://git-wip-us.apache.org/repos/asf/stratos/blob/50ce2997/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/schemas/schema.xsd
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/schemas/schema.xsd b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/schemas/schema.xsd
index 19dabe2..609b040 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/schemas/schema.xsd
+++ b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/schemas/schema.xsd
@@ -128,7 +128,6 @@
<xs:sequence>
<xs:element name="type" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
<xs:element name="imageId" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
- <xs:element name="maxInstanceLimit" type="xs:int" minOccurs="1" maxOccurs="1" nillable="false"/>
<xs:element name="property" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:all>