You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by pa...@apache.org on 2011/10/18 00:26:55 UTC
svn commit: r1185400 - in
/incubator/airavata/trunk/modules/commons/gfac-schema/schemas:
ApplicationDescription.xsd BasicTypes.xsd ServiceMap.xsd error.xsd
gfac-schemas.xsdconfig gfac-simple-types.xsd gfac.xsd
Author: patanachai
Date: Mon Oct 17 22:26:55 2011
New Revision: 1185400
URL: http://svn.apache.org/viewvc?rev=1185400&view=rev
Log:
AIRAVATA-105 parameters
Removed:
incubator/airavata/trunk/modules/commons/gfac-schema/schemas/BasicTypes.xsd
incubator/airavata/trunk/modules/commons/gfac-schema/schemas/error.xsd
incubator/airavata/trunk/modules/commons/gfac-schema/schemas/gfac.xsd
Modified:
incubator/airavata/trunk/modules/commons/gfac-schema/schemas/ApplicationDescription.xsd
incubator/airavata/trunk/modules/commons/gfac-schema/schemas/ServiceMap.xsd
incubator/airavata/trunk/modules/commons/gfac-schema/schemas/gfac-schemas.xsdconfig
incubator/airavata/trunk/modules/commons/gfac-schema/schemas/gfac-simple-types.xsd
Modified: incubator/airavata/trunk/modules/commons/gfac-schema/schemas/ApplicationDescription.xsd
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/gfac-schema/schemas/ApplicationDescription.xsd?rev=1185400&r1=1185399&r2=1185400&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/gfac-schema/schemas/ApplicationDescription.xsd (original)
+++ incubator/airavata/trunk/modules/commons/gfac-schema/schemas/ApplicationDescription.xsd Mon Oct 17 22:26:55 2011
@@ -58,6 +58,7 @@
</extension>
</complexContent>
</complexType>
+
<complexType name="applicationDeploymentDescription">
<sequence>
<element minOccurs="0" name="inputDir" type="string"/>
Modified: incubator/airavata/trunk/modules/commons/gfac-schema/schemas/ServiceMap.xsd
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/gfac-schema/schemas/ServiceMap.xsd?rev=1185400&r1=1185399&r2=1185400&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/gfac-schema/schemas/ServiceMap.xsd (original)
+++ incubator/airavata/trunk/modules/commons/gfac-schema/schemas/ServiceMap.xsd Mon Oct 17 22:26:55 2011
@@ -10,10 +10,14 @@
language governing permissions and limitations under the License. -->
<schema targetNamespace="http://schemas.airavata.apache.org/gfac/type"
- xmlns:gfac="http://schemas.airavata.apache.org/gfac/type" xmlns="http://www.w3.org/2001/XMLSchema"
+ xmlns:gfac="http://schemas.airavata.apache.org/gfac/type"
+ xmlns="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified">
+ <include schemaLocation="gfac-simple-types.xsd"/>
+
<element name="serviceDescription" type="gfac:serviceDescription"/>
+
<complexType name="serviceDescription">
<sequence>
<element minOccurs="0" name="name" type="string"/>
@@ -21,21 +25,12 @@
<element maxOccurs="unbounded" minOccurs="0" name="outputParameters" nillable="true" type="gfac:parameter"/>
</sequence>
</complexType>
+
<complexType name="parameter">
<sequence>
<element minOccurs="0" name="description" type="string"/>
<element minOccurs="0" name="name" type="string"/>
- <element minOccurs="0" name="type" type="gfac:dataType"/>
+ <element minOccurs="0" name="type" type="gfac:ParameterType"/>
</sequence>
</complexType>
- <simpleType name="dataType">
- <restriction base="string">
- <enumeration value="String"/>
- <enumeration value="Double"/>
- <enumeration value="Integer"/>
- <enumeration value="Float"/>
- <enumeration value="Boolean"/>
- <enumeration value="File"/>
- </restriction>
- </simpleType>
</schema>
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/commons/gfac-schema/schemas/gfac-schemas.xsdconfig
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/gfac-schema/schemas/gfac-schemas.xsdconfig?rev=1185400&r1=1185399&r2=1185400&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/gfac-schema/schemas/gfac-schemas.xsdconfig (original)
+++ incubator/airavata/trunk/modules/commons/gfac-schema/schemas/gfac-schemas.xsdconfig Mon Oct 17 22:26:55 2011
@@ -1,11 +1,7 @@
<xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config">
- <xb:namespace uri="http://schemas.airavata.apache.org/gfac">
+ <xb:namespace uri="http://schemas.airavata.apache.org/gfac/type">
<xb:package>org.apache.airavata.schemas.gfac</xb:package>
</xb:namespace>
-
- <xb:namespace uri="http://inca.sdsc.edu/dataModel/application1.0">
- <xb:package>org.apache.airavata.schemas.gfac.inca.faults</xb:package>
- </xb:namespace>
</xb:config>
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/commons/gfac-schema/schemas/gfac-simple-types.xsd
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/gfac-schema/schemas/gfac-simple-types.xsd?rev=1185400&r1=1185399&r2=1185400&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/gfac-schema/schemas/gfac-simple-types.xsd (original)
+++ incubator/airavata/trunk/modules/commons/gfac-schema/schemas/gfac-simple-types.xsd Mon Oct 17 22:26:55 2011
@@ -8,68 +8,89 @@
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY ~ KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
-
- <xsd:schema elementFormDefault="unqualified" targetNamespace="http://schemas.airavata.apache.org/gfac"
- xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:gfac="http://schemas.airavata.apache.org/gfac">
- <xsd:simpleType name="LEADFileIDType">
- <xsd:restriction base="xsd:anyURI" />
- </xsd:simpleType>
- <xsd:simpleType name="LEADNameListFileType">
- <xsd:restriction base="xsd:anyURI" />
- </xsd:simpleType>
- <xsd:simpleType name="LEADNameListPropertiesFileType">
- <xsd:restriction base="xsd:anyURI" />
- </xsd:simpleType>
- <xsd:simpleType name="HostNameType">
- <xsd:restriction base="xsd:string" />
- </xsd:simpleType>
- <xsd:complexType name="DataIDType">
- <xsd:simpleContent>
- <xsd:extension base="xsd:anyURI">
- <xsd:attribute name="location" type="xsd:string" use="optional" />
- </xsd:extension>
- </xsd:simpleContent>
- </xsd:complexType>
- <xsd:complexType name="LEADFileIDArrayType">
- <xsd:sequence>
- <xsd:element maxOccurs="unbounded" minOccurs="0" name="value" type="xsd:anyURI" />
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="StringArrayType">
- <xsd:sequence>
- <xsd:element maxOccurs="unbounded" minOccurs="0" name="value" type="xsd:string" />
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="IntegerArrayType">
- <xsd:sequence>
- <xsd:element maxOccurs="unbounded" minOccurs="0" name="value" type="xsd:int" />
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="FloatArrayType">
- <xsd:sequence>
- <xsd:element maxOccurs="unbounded" minOccurs="0" name="value" type="xsd:float" />
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="DoubleArrayType">
- <xsd:sequence>
- <xsd:element maxOccurs="unbounded" minOccurs="0" name="value" type="xsd:double" />
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="BooleanArrayType">
- <xsd:sequence>
- <xsd:element maxOccurs="unbounded" minOccurs="0" name="value" type="xsd:boolean" />
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="URIArrayType">
- <xsd:sequence>
- <xsd:element maxOccurs="unbounded" minOccurs="0" name="value" type="xsd:anyURI" />
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="DataIDArrayType">
- <xsd:sequence>
- <xsd:element maxOccurs="unbounded" minOccurs="0" name="value" type="gfac:DataIDType" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:schema>
\ No newline at end of file
+
+<schema elementFormDefault="unqualified"
+ targetNamespace="http://schemas.airavata.apache.org/gfac/type" xmlns="http://www.w3.org/2001/XMLSchema"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gfac="http://schemas.airavata.apache.org/gfac/type">
+
+ <simpleType name="DataType">
+ <restriction base="string">
+ <enumeration value="String" />
+ <enumeration value="Double" />
+ <enumeration value="Integer" />
+ <enumeration value="Float" />
+ <enumeration value="Boolean" />
+ <enumeration value="File" />
+ </restriction>
+ </simpleType>
+
+ <complexType abstract="true" name="ParameterType">
+ <attribute name="type" type="gfac:DataType" use="required"/>
+ </complexType>
+
+ <complexType name="StringParameter">
+ <complexContent>
+ <extension base="gfac:ParameterType">
+ <sequence>
+ <element name="value" nillable="true" type="xsd:string" />
+ </sequence>
+ <attribute name="type" fixed="String"/>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="DoubleParameter">
+ <complexContent>
+ <extension base="gfac:ParameterType">
+ <sequence>
+ <element name="value" nillable="true" type="xsd:double" />
+ </sequence>
+ <attribute name="type" fixed="Double"/>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="IntegerParameter">
+ <complexContent>
+ <extension base="gfac:ParameterType">
+ <sequence>
+ <element name="value" nillable="true" type="xsd:int" />
+ </sequence>
+ <attribute name="type" fixed="Integer"/>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="FloatParameter">
+ <complexContent>
+ <extension base="gfac:ParameterType">
+ <sequence>
+ <element name="Float" nillable="true" type="xsd:float" />
+ </sequence>
+ <attribute name="type" fixed="Float"/>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="BooleanParameter">
+ <complexContent>
+ <extension base="gfac:ParameterType">
+ <sequence>
+ <element name="value" nillable="true" type="xsd:boolean" />
+ </sequence>
+ <attribute name="type" fixed="Boolean"/>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="FileParameter">
+ <complexContent>
+ <extension base="gfac:ParameterType">
+ <sequence>
+ <element name="value" nillable="true" type="xsd:anyURI" />
+ </sequence>
+ <attribute name="type" fixed="File"/>
+ </extension>
+ </complexContent>
+ </complexType>
+</schema>
\ No newline at end of file