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/04/30 12:36:29 UTC
[1/2] git commit: The subscribe request from the UI sends in
additional params. Adding them too schema and making them optional
Repository: incubator-stratos
Updated Branches:
refs/heads/master a2f393338 -> f6ce4ceac
The subscribe request from the UI sends in additional params. Adding them too schema and making them optional
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/76a079e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/76a079e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/76a079e9
Branch: refs/heads/master
Commit: 76a079e9572f6355137e77088e8e54ce89a283b0
Parents: 0b86133
Author: Pradeep Fernando <pr...@gmail.com>
Authored: Wed Apr 30 16:04:57 2014 +0530
Committer: Pradeep Fernando <pr...@gmail.com>
Committed: Wed Apr 30 16:04:57 2014 +0530
----------------------------------------------------------------------
.../src/main/webapp/stratos-test/WEB-INF/schemas/schema.xsd | 5 ++++-
.../src/main/webapp/stratos/WEB-INF/schemas/schema.xsd | 3 +++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/76a079e9/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos-test/WEB-INF/schemas/schema.xsd
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos-test/WEB-INF/schemas/schema.xsd b/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos-test/WEB-INF/schemas/schema.xsd
index 769659e..712d417 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos-test/WEB-INF/schemas/schema.xsd
+++ b/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos-test/WEB-INF/schemas/schema.xsd
@@ -13,7 +13,7 @@
</xs:all>
</xs:complexType>
</xs:element>
-
+
<xs:element name="partition">
<xs:complexType>
<xs:sequence>
@@ -180,6 +180,9 @@
<xs:element name="commitsEnabled" type="xs:boolean" minOccurs="0" maxOccurs="1" nillable="false"/>
<xs:element name="autoscalePolicy" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
<xs:element name="deploymentPolicy" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
+ <xs:element name="persistanceRequired" type="xs:string" minOccurs="0" maxOccurs="1" nillable="false"/>
+ <xs:element name="size" type="xs:int" minOccurs="0" maxOccurs="1" nillable="false"/>
+ <xs:element name="removeOnTermination" type="xs:boolean" minOccurs="0" maxOccurs="1" nillable="false"/>
</xs:all>
</xs:complexType>
</xs:element>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/76a079e9/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd b/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd
index 5a5ea6a..712d417 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd
+++ b/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd
@@ -180,6 +180,9 @@
<xs:element name="commitsEnabled" type="xs:boolean" minOccurs="0" maxOccurs="1" nillable="false"/>
<xs:element name="autoscalePolicy" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
<xs:element name="deploymentPolicy" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
+ <xs:element name="persistanceRequired" type="xs:string" minOccurs="0" maxOccurs="1" nillable="false"/>
+ <xs:element name="size" type="xs:int" minOccurs="0" maxOccurs="1" nillable="false"/>
+ <xs:element name="removeOnTermination" type="xs:boolean" minOccurs="0" maxOccurs="1" nillable="false"/>
</xs:all>
</xs:complexType>
</xs:element>
[2/2] 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/f6ce4cea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f6ce4cea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f6ce4cea
Branch: refs/heads/master
Commit: f6ce4ceac27db186ee3117ef177c44f635c6e0dc
Parents: 76a079e a2f3933
Author: Pradeep Fernando <pr...@gmail.com>
Authored: Wed Apr 30 16:05:09 2014 +0530
Committer: Pradeep Fernando <pr...@gmail.com>
Committed: Wed Apr 30 16:05:09 2014 +0530
----------------------------------------------------------------------
.../impl/CloudControllerServiceImpl.java | 54 ++++++++++++--------
.../controller/util/CloudControllerUtil.java | 4 +-
2 files changed, 36 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
Fwd: [1/2] git commit: The subscribe request from the UI sends in
additional params. Adding them too schema and making them optional
Posted by Isuru Perera <is...@wso2.com>.
s/persistance/persistence
I have seen this in other places also.
Not pointing an issue with this commit, but in general we should use proper
spellings.
Thanks!
---------- Forwarded message ----------
From: <pr...@apache.org>
Date: Wed, Apr 30, 2014 at 3:36 AM
Subject: [1/2] git commit: The subscribe request from the UI sends in
additional params. Adding them too schema and making them optional
To: commits@stratos.incubator.apache.org
Repository: incubator-stratos
Updated Branches:
refs/heads/master a2f393338 -> f6ce4ceac
The subscribe request from the UI sends in additional params. Adding them
too schema and making them optional
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/76a079e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/76a079e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/76a079e9
Branch: refs/heads/master
Commit: 76a079e9572f6355137e77088e8e54ce89a283b0
Parents: 0b86133
Author: Pradeep Fernando <pr...@gmail.com>
Authored: Wed Apr 30 16:04:57 2014 +0530
Committer: Pradeep Fernando <pr...@gmail.com>
Committed: Wed Apr 30 16:04:57 2014 +0530
----------------------------------------------------------------------
.../src/main/webapp/stratos-test/WEB-INF/schemas/schema.xsd | 5 ++++-
.../src/main/webapp/stratos/WEB-INF/schemas/schema.xsd | 3 +++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/76a079e9/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos-test/WEB-INF/schemas/schema.xsd
----------------------------------------------------------------------
diff --git
a/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos-test/WEB-INF/schemas/schema.xsd
b/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos-test/WEB-INF/schemas/schema.xsd
index 769659e..712d417 100644
---
a/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos-test/WEB-INF/schemas/schema.xsd
+++
b/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos-test/WEB-INF/schemas/schema.xsd
@@ -13,7 +13,7 @@
</xs:all>
</xs:complexType>
</xs:element>
-
+
<xs:element name="partition">
<xs:complexType>
<xs:sequence>
@@ -180,6 +180,9 @@
<xs:element name="commitsEnabled" type="xs:boolean"
minOccurs="0" maxOccurs="1" nillable="false"/>
<xs:element name="autoscalePolicy" type="xs:string"
minOccurs="1" maxOccurs="1" nillable="false"/>
<xs:element name="deploymentPolicy" type="xs:string"
minOccurs="1" maxOccurs="1" nillable="false"/>
+ <xs:element name="persistanceRequired" type="xs:string"
minOccurs="0" maxOccurs="1" nillable="false"/>
+ <xs:element name="size" type="xs:int" minOccurs="0"
maxOccurs="1" nillable="false"/>
+ <xs:element name="removeOnTermination" type="xs:boolean"
minOccurs="0" maxOccurs="1" nillable="false"/>
</xs:all>
</xs:complexType>
</xs:element>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/76a079e9/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd
----------------------------------------------------------------------
diff --git
a/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd
b/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd
index 5a5ea6a..712d417 100644
---
a/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd
+++
b/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd
@@ -180,6 +180,9 @@
<xs:element name="commitsEnabled" type="xs:boolean"
minOccurs="0" maxOccurs="1" nillable="false"/>
<xs:element name="autoscalePolicy" type="xs:string"
minOccurs="1" maxOccurs="1" nillable="false"/>
<xs:element name="deploymentPolicy" type="xs:string"
minOccurs="1" maxOccurs="1" nillable="false"/>
+ <xs:element name="persistanceRequired" type="xs:string"
minOccurs="0" maxOccurs="1" nillable="false"/>
+ <xs:element name="size" type="xs:int" minOccurs="0"
maxOccurs="1" nillable="false"/>
+ <xs:element name="removeOnTermination" type="xs:boolean"
minOccurs="0" maxOccurs="1" nillable="false"/>
</xs:all>
</xs:complexType>
</xs:element>
--
Isuru Perera
Senior Software Engineer | WSO2, Inc. | http://wso2.com/
Lean . Enterprise . Middleware
about.me/chrishantha