airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject svn commit: r1450404 - in /airavata/trunk/modules/commons/gfac-schema/src/main/resources/schemas: ApplicationDeploymentDescription.xsd HostDescription.xsd
Date Tue, 26 Feb 2013 20:43:39 GMT
Author: lahiru
Date: Tue Feb 26 20:43:39 2013
New Revision: 1450404

URL: http://svn.apache.org/r1450404
Log:
changing gfac-schema to support cloud bursting.

Modified:
    airavata/trunk/modules/commons/gfac-schema/src/main/resources/schemas/ApplicationDeploymentDescription.xsd
    airavata/trunk/modules/commons/gfac-schema/src/main/resources/schemas/HostDescription.xsd

Modified: airavata/trunk/modules/commons/gfac-schema/src/main/resources/schemas/ApplicationDeploymentDescription.xsd
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/gfac-schema/src/main/resources/schemas/ApplicationDeploymentDescription.xsd?rev=1450404&r1=1450403&r2=1450404&view=diff
==============================================================================
--- airavata/trunk/modules/commons/gfac-schema/src/main/resources/schemas/ApplicationDeploymentDescription.xsd
(original)
+++ airavata/trunk/modules/commons/gfac-schema/src/main/resources/schemas/ApplicationDeploymentDescription.xsd
Tue Feb 26 20:43:39 2013
@@ -61,35 +61,35 @@
 	</complexType>
 
     <complexType name="hadoopApplicationDeploymentDescriptionType">
-        <complexContent>
-            <extension base="gfac:applicationDeploymentDescriptionType">
-                <sequence>
-                    <element name="whirrConfigurationFile" type="xsd:string" minOccurs="0"
maxOccurs="1"/>
-                    <element name="byonClusterConfigurationFile" type="xsd:string" minOccurs="0"
maxOccurs="1"/>
-                    <element name="whirrConfiguration" minOccurs="0" maxOccurs="1">
-                        <complexType>
-                            <sequence>
-                                <element name="configuration" maxOccurs="1" minOccurs="1">
-                                    <complexType>
-                                        <sequence>
-                                            <element name="property" maxOccurs="unbounded">
-                                                <complexType>
-                                                    <sequence>
-                                                        <element name="name" maxOccurs="1"
minOccurs="1"/>
-                                                        <element name="value" maxOccurs="1"
minOccurs="1"/>
-                                                    </sequence>
-                                                </complexType>
-                                            </element>
-                                        </sequence>
-                                    </complexType>
-                                </element>
-                            </sequence>
-                        </complexType>
-                    </element>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
+            <complexContent>
+                <extension base="gfac:applicationDeploymentDescriptionType">
+                    <sequence>
+                        <element name="hadoopJobConfiguration">
+                            <complexType>
+                                <sequence>
+                                    <element name="jarLocation" type="xsd:string"/>
+                                    <element name="jobName" type="xsd:string"/>
+                                    <element name="combinerClass" minOccurs="0" maxOccurs="1"
type="xsd:string"/>
+                                    <element name="mapperClass"  type="xsd:string"/>
+                                    <element name="reducerClass" type="xsd:string"/>
+                                    <element name="inputFormatClass" type="xsd:string"/>
+                                    <element name="outputFormatClass" type="xsd:string"/>
+                                    <element name="mapOutputKeyClass" type="xsd:string"/>
+                                    <element name="mapOutputValueClass" type="xsd:string"/>
+                                    <element name="OutputKeyClass" type="xsd:string"/>
+                                    <element name="OutputValueClass" type="xsd:string"/>
+                                    <element name="numReduceTasks" type="xsd:int" minOccurs="0"
maxOccurs="1"/>
+                                    <element name="partitionerClass" type="xsd:string"
maxOccurs="1" minOccurs="0"/>
+                                    <element name="hdfsInputDirectory" type="xsd:string"/>
+                                    <element name="hdfsOutputDirectory" type="xsd:string"/>
+                                </sequence>
+                            </complexType>
+                        </element>
+                    </sequence>
+                </extension>
+            </complexContent>
+        </complexType>
+
 
 	<simpleType name="jobTypeType">
 		<restriction base="xsd:string">

Modified: airavata/trunk/modules/commons/gfac-schema/src/main/resources/schemas/HostDescription.xsd
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/gfac-schema/src/main/resources/schemas/HostDescription.xsd?rev=1450404&r1=1450403&r2=1450404&view=diff
==============================================================================
--- airavata/trunk/modules/commons/gfac-schema/src/main/resources/schemas/HostDescription.xsd
(original)
+++ airavata/trunk/modules/commons/gfac-schema/src/main/resources/schemas/HostDescription.xsd
Tue Feb 26 20:43:39 2013
@@ -89,4 +89,37 @@
 		</complexContent>
 	</complexType>
 
+    <!-- Hadoop Host Description -->
+    <complexType name="hadoopHostType">
+        <complexContent>
+            <extension base="gfac:hostDescriptionType">
+                <sequence>
+                    <element name="hadoopConfigurationDirectory" type="xsd:string" minOccurs="0"
maxOccurs="1"/>
+                    <element name="whirrConfiguration" maxOccurs="1" minOccurs="0">
+                        <complexType>
+                            <sequence>
+                                <element name="configurationFile" type="xsd:string" minOccurs="0"
maxOccurs="1"/>
+                                <element name="byonClusterConfigurationFile" type="xsd:string"
minOccurs="0" maxOccurs="1"/>
+                                <element name="configuration" minOccurs="0" maxOccurs="1">
+                                    <complexType>
+                                        <sequence>
+                                            <element name="property" maxOccurs="unbounded">
+                                                <complexType>
+                                                    <sequence>
+                                                        <element name="name" type="xsd:string"
maxOccurs="1" minOccurs="1"/>
+                                                        <element name="value" type="xsd:string"
maxOccurs="1" minOccurs="1"/>
+                                                    </sequence>
+                                                </complexType>
+                                            </element>
+                                        </sequence>
+                                    </complexType>
+                                </element>
+                            </sequence>
+                        </complexType>
+                    </element>
+                </sequence>
+            </extension>
+        </complexContent>
+    </complexType>
+
 </schema>
\ No newline at end of file



Mime
View raw message