airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject svn commit: r1527756 - /airavata/trunk/modules/commons/gfac-schema/src/main/resources/schemas/HostDescription.xsd
Date Mon, 30 Sep 2013 20:08:45 GMT
Author: lahiru
Date: Mon Sep 30 20:08:44 2013
New Revision: 1527756

URL: http://svn.apache.org/r1527756
Log:
adding gsisshhost to system.

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

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=1527756&r1=1527755&r2=1527756&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
Mon Sep 30 20:08:44 2013
@@ -11,40 +11,67 @@
 	the specific language governing permissions and limitations under the License. -->
 
 <schema targetNamespace="http://airavata.apache.org/schemas/gfac/2012/12"
-	xmlns:gfac="http://airavata.apache.org/schemas/gfac/2012/12" xmlns="http://www.w3.org/2001/XMLSchema"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+        xmlns:gfac="http://airavata.apache.org/schemas/gfac/2012/12" xmlns="http://www.w3.org/2001/XMLSchema"
+        xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
 
-	<include schemaLocation="BasicTypes.xsd" />
+    <include schemaLocation="BasicTypes.xsd"/>
 
-	<element name="hostDescription" type="gfac:hostDescriptionType" />
+    <element name="hostDescription" type="gfac:hostDescriptionType"/>
 
-	<!-- Host Description -->
-	<complexType name="hostDescriptionType">
-		<sequence>
-			<element name="authorInfo" type="gfac:authorInfoType"
-				minOccurs="0" maxOccurs="unbounded" />
-			<element name="documentInfo" type="gfac:documentInfoType"
-				minOccurs="0" maxOccurs="1" />
-			<element name="hostName" type="xsd:string" minOccurs="1"
-				maxOccurs="1" />
-			<element name="hostAddress" type="xsd:string" minOccurs="1"
-				maxOccurs="1" />
-		</sequence>
-	</complexType>
-
-	<!-- Globus Host Description -->
-	<complexType name="globusHostType">
-		<complexContent>
-			<extension base="gfac:hostDescriptionType">
-				<sequence>
-					<element name="gridFTPEndPoint" type="xsd:string"
-						minOccurs="1" maxOccurs="unbounded" />
-					<element name="globusGateKeeperEndPoint" type="xsd:string"
-						minOccurs="1" maxOccurs="unbounded" />
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
+    <!-- Host Description -->
+    <complexType name="hostDescriptionType">
+        <sequence>
+            <element name="authorInfo" type="gfac:authorInfoType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+            <element name="documentInfo" type="gfac:documentInfoType"
+                     minOccurs="0" maxOccurs="1"/>
+            <element name="hostName" type="xsd:string" minOccurs="1"
+                     maxOccurs="1"/>
+            <element name="hostAddress" type="xsd:string" minOccurs="1"
+                     maxOccurs="1"/>
+        </sequence>
+    </complexType>
+
+
+    <complexType name="preJobCommands">
+        <sequence>
+            <element name="command" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+    </complexType>
+
+    <complexType name="postJobCommands">
+        <sequence>
+            <element name="command" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+    </complexType>
+
+    <complexType name="exportProperties">
+        <sequence>
+            <element name="name" minOccurs="1" maxOccurs="unbounded">
+                <complexType>
+                    <simpleContent>
+                        <extension base="xsd:string">
+                            <attribute name="value" type="xsd:string" use="required"/>
+                        </extension>
+                    </simpleContent>
+                </complexType>
+            </element>
+        </sequence>
+    </complexType>
+
+    <!-- Globus Host Description -->
+    <complexType name="globusHostType">
+        <complexContent>
+            <extension base="gfac:hostDescriptionType">
+                <sequence>
+                    <element name="gridFTPEndPoint" type="xsd:string"
+                             minOccurs="1" maxOccurs="unbounded"/>
+                    <element name="globusGateKeeperEndPoint" type="xsd:string"
+                             minOccurs="1" maxOccurs="unbounded"/>
+                </sequence>
+            </extension>
+        </complexContent>
+    </complexType>
 
     <!-- EC2 Host Description -->
     <complexType name="ec2HostType">
@@ -52,9 +79,9 @@
             <extension base="gfac:hostDescriptionType">
                 <sequence>
                     <element name="imageID" type="xsd:string"
-                             minOccurs="1" maxOccurs="unbounded" />
+                             minOccurs="1" maxOccurs="unbounded"/>
                     <element name="instanceID" type="xsd:string"
-                             minOccurs="1" maxOccurs="unbounded" />
+                             minOccurs="1" maxOccurs="unbounded"/>
                 </sequence>
             </extension>
         </complexContent>
@@ -64,40 +91,39 @@
         <complexContent>
             <extension base="gfac:hostDescriptionType">
                 <sequence>
-                   <sequence>
-					<element name="gridFTPEndPoint" type="xsd:string"
-						minOccurs="0" maxOccurs="unbounded" />
-					<element name="unicoreBESEndPoint" type="xsd:string"
-						minOccurs="1" maxOccurs="unbounded" />
-				</sequence>
+                    <sequence>
+                        <element name="gridFTPEndPoint" type="xsd:string"
+                                 minOccurs="0" maxOccurs="unbounded"/>
+                        <element name="unicoreBESEndPoint" type="xsd:string"
+                                 minOccurs="1" maxOccurs="unbounded"/>
+                    </sequence>
                 </sequence>
             </extension>
         </complexContent>
     </complexType>
 
-	<complexType name="gsisshHostType">
-		<complexContent>
-			<extension base="gfac:hostDescriptionType">
-				<sequence>
-					<element name="gridFTPEndPoint" type="xsd:string"
-						minOccurs="0" maxOccurs="unbounded" />
-					<element name="gsisshHostAddress" type="xsd:string"
-						minOccurs="1" maxOccurs="unbounded" />
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-
-	<!-- SSH Host Description -->
-	<complexType name="SSHHostType">
-		<complexContent>
-			<extension base="gfac:hostDescriptionType">
-				<sequence>
-					<element name="fileEndPointPrefix" type="xsd:string" minOccurs="0" maxOccurs="unbounded"
/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
+    <complexType name="gsisshHostType">
+        <complexContent>
+            <extension base="gfac:hostDescriptionType">
+                <sequence>
+                    <element name="installedParentPath" type="xsd:string" minOccurs="1"
maxOccurs="1"/>
+                    <element name="exports" type="gfac:exportProperties" minOccurs="0"
maxOccurs="1"/>
+                    <element name="preJobCommands" type="gfac:exportProperties" minOccurs="0"
maxOccurs="1"/>
+                    <element name="postJobCommands" type="gfac:exportProperties" minOccurs="0"
maxOccurs="1"/>
+                </sequence>
+            </extension>
+        </complexContent>
+    </complexType>
+    <!-- SSH Host Description -->
+    <complexType name="SSHHostType">
+        <complexContent>
+            <extension base="gfac:hostDescriptionType">
+                <sequence>
+                    <element name="fileEndPointPrefix" type="xsd:string" minOccurs="0"
maxOccurs="unbounded"/>
+                </sequence>
+            </extension>
+        </complexContent>
+    </complexType>
 
     <!-- Hadoop Host Description -->
     <complexType name="hadoopHostType">
@@ -109,15 +135,18 @@
                         <complexType>
                             <sequence>
                                 <element name="configurationFile" type="xsd:string" minOccurs="0"
maxOccurs="1"/>
-                                <element name="byonClusterConfigurationFile" 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"/>
+                                                        <element name="name" type="xsd:string"
maxOccurs="1"
+                                                                 minOccurs="1"/>
+                                                        <element name="value" type="xsd:string"
maxOccurs="1"
+                                                                 minOccurs="1"/>
                                                     </sequence>
                                                 </complexType>
                                             </element>



Mime
View raw message