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/19 03:00:28 UTC

[3/3] stratos git commit: Update schema to add persistance to subcribable info

Update schema to add persistance to subcribable info


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e95616d4
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e95616d4
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e95616d4

Branch: refs/heads/master
Commit: e95616d4a50eeae4ba507449df2bff56fcd1d180
Parents: 1c73534
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Thu Mar 19 07:30:19 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Thu Mar 19 07:30:19 2015 +0530

----------------------------------------------------------------------
 .../webapp/api-test/WEB-INF/schemas/schema.xsd  | 37 +++++++++-----------
 .../main/webapp/api/WEB-INF/schemas/schema.xsd  | 37 +++++++++-----------
 2 files changed, 34 insertions(+), 40 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/e95616d4/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 b45474a..6bf0845 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
@@ -160,23 +160,6 @@
                         </xs:sequence>
                     </xs:complexType>
                 </xs:element>
-                <xs:element name="persistence" minOccurs="0" maxOccurs="1" nillable="true">
-                    <xs:complexType>
-                        <xs:sequence>
-                            <xs:element name="isRequired" type="xs:boolean" minOccurs="1" maxOccurs="1" nillable="false"/>
-                            <xs:element name="volume" minOccurs="1" maxOccurs="unbounded">
-                                <xs:complexType>
-                                    <xs:all>
-                                        <xs:element name="device" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
-                                        <xs:element name="mappingPath" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
-                                        <xs:element name="size" type="xs:int" minOccurs="1" maxOccurs="1" nillable="false"/>
-                                        <xs:element name="removeOnTermination" type="xs:boolean" minOccurs="1" maxOccurs="1" nillable="false"/>
-                                    </xs:all>
-                                </xs:complexType>
-                            </xs:element>
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
                 <xs:element name="property" minOccurs="0" maxOccurs="unbounded">
                     <xs:complexType>
                         <xs:all>
@@ -201,9 +184,23 @@
                 <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:element name="persistence" minOccurs="0" maxOccurs="1" nillable="true">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="isRequired" type="xs:boolean" minOccurs="1" maxOccurs="1" nillable="false"/>
+                            <xs:element name="volume" minOccurs="1" maxOccurs="unbounded">
+                                <xs:complexType>
+                                    <xs:all>
+                                        <xs:element name="device" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
+                                        <xs:element name="mappingPath" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
+                                        <xs:element name="size" type="xs:int" minOccurs="1" maxOccurs="1" nillable="false"/>
+                                        <xs:element name="removeOnTermination" type="xs:boolean" minOccurs="1" maxOccurs="1" nillable="false"/>
+                                    </xs:all>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
             </xs:all>
         </xs:complexType>
     </xs:element>

http://git-wip-us.apache.org/repos/asf/stratos/blob/e95616d4/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 609b040..18b2c46 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
@@ -177,23 +177,6 @@
                         </xs:sequence>
                     </xs:complexType>
                 </xs:element>
-                <xs:element name="persistence" minOccurs="0" maxOccurs="1" nillable="true">
-                    <xs:complexType>
-                        <xs:sequence>
-                            <xs:element name="isRequired" type="xs:boolean" minOccurs="1" maxOccurs="1" nillable="false"/>
-                            <xs:element name="volume" minOccurs="1" maxOccurs="unbounded">
-                                <xs:complexType>
-                                    <xs:all>
-                                        <xs:element name="device" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
-                                        <xs:element name="mappingPath" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
-                                        <xs:element name="size" type="xs:int" minOccurs="1" maxOccurs="1" nillable="false"/>
-                                        <xs:element name="removeOnTermination" type="xs:boolean" minOccurs="1" maxOccurs="1" nillable="false"/>
-                                    </xs:all>
-                                </xs:complexType>
-                            </xs:element>
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
                 <xs:element name="property" minOccurs="0" maxOccurs="unbounded">
                     <xs:complexType>
                         <xs:all>
@@ -218,9 +201,23 @@
                 <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:element name="persistence" minOccurs="0" maxOccurs="1" nillable="true">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="isRequired" type="xs:boolean" minOccurs="1" maxOccurs="1" nillable="false"/>
+                            <xs:element name="volume" minOccurs="1" maxOccurs="unbounded">
+                                <xs:complexType>
+                                    <xs:all>
+                                        <xs:element name="device" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
+                                        <xs:element name="mappingPath" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
+                                        <xs:element name="size" type="xs:int" minOccurs="1" maxOccurs="1" nillable="false"/>
+                                        <xs:element name="removeOnTermination" type="xs:boolean" minOccurs="1" maxOccurs="1" nillable="false"/>
+                                    </xs:all>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
             </xs:all>
         </xs:complexType>
     </xs:element>