You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2013/10/07 14:56:36 UTC
svn commit: r1529827 - in /airavata/sandbox/gsoc2013/app/scripts/model: ./
ApplicationDeploymentDescription.json anyMetadata.json authorInfoType.json
documentInfoType.json nameValuePairType.json serviceDescription.json
Author: smarru
Date: Mon Oct 7 12:56:36 2013
New Revision: 1529827
URL: http://svn.apache.org/r1529827
Log:
commiting the missing patch for AIRAVATA-906
Added:
airavata/sandbox/gsoc2013/app/scripts/model/
airavata/sandbox/gsoc2013/app/scripts/model/ApplicationDeploymentDescription.json
airavata/sandbox/gsoc2013/app/scripts/model/anyMetadata.json
airavata/sandbox/gsoc2013/app/scripts/model/authorInfoType.json
airavata/sandbox/gsoc2013/app/scripts/model/documentInfoType.json
airavata/sandbox/gsoc2013/app/scripts/model/nameValuePairType.json
airavata/sandbox/gsoc2013/app/scripts/model/serviceDescription.json
Added: airavata/sandbox/gsoc2013/app/scripts/model/ApplicationDeploymentDescription.json
URL: http://svn.apache.org/viewvc/airavata/sandbox/gsoc2013/app/scripts/model/ApplicationDeploymentDescription.json?rev=1529827&view=auto
==============================================================================
--- airavata/sandbox/gsoc2013/app/scripts/model/ApplicationDeploymentDescription.json (added)
+++ airavata/sandbox/gsoc2013/app/scripts/model/ApplicationDeploymentDescription.json Mon Oct 7 12:56:36 2013
@@ -0,0 +1,311 @@
+{
+ "type": "object",
+ "$schema": "http://json-schema.org/draft-04/schema#",
+ "id": "http://airavata.apache.org/schemas/gfac/2012/12/applicationDeploymentDescription",
+ "properties": {
+ "applicationDeploymentDescription": {
+ "type": "object",
+ "$ref": "#definitions/applicationDeploymentDescriptionType"
+ }
+ },
+ "definitions": {
+ "applicationDeploymentDescriptionType": {
+ "type": "object",
+ "properties": {
+ "authorInfo": {
+ "$ref": "http://airavata.apache.org/schemas/gfac/2012/12/authorInfoType"
+ },
+ "documentInfo": {
+ "$ref": "http://airavata.apache.org/schemas/gfac/2012/12/documentInfoType"
+ },
+ "applicationName": {
+ "@targetNamespace": {
+ "type": "string"
+ }
+ },
+ "executableLocation": {
+ "type": "string"
+ },
+ "applicationEnvironment": {
+ "type": "object",
+ "$ref": "http://airavata.apache.org/schemas/gfac/2012/12/nameValuePairType"
+ },
+ "standardError": {
+ "type": "string"
+ },
+ "standardInput": {
+ "type": "string"
+ },
+ "standardOutput": {
+ "type": "string"
+ },
+ "inputDataDirectory": {
+ "type": "string"
+ },
+ "outputDataDirectory": {
+ "type": "string"
+ },
+ "scratchWorkingDirectory": {
+ "type": "string"
+ },
+ "staticWorkingDirectory": {
+ "type": "string"
+ }
+ }
+ },
+ "ec2ApplicationDeploymentType": {
+ "type": "object",
+ "properties": {
+ "authorInfo": {
+ "$ref": "http://airavata.apache.org/schemas/gfac/2012/12/authorInfoType"
+ },
+ "documentInfo": {
+ "$ref": "http://airavata.apache.org/schemas/gfac/2012/12/documentInfoType"
+ },
+ "applicationName": {
+ "@targetNamespace": {
+ "type": "string"
+ }
+ },
+ "executableLocation": {
+ "type": "string"
+ },
+ "applicationEnvironment": {
+ "type": "object",
+ "$ref": "http://airavata.apache.org/schemas/gfac/2012/12/nameValuePairType"
+ },
+ "standardError": {
+ "type": "string"
+ },
+ "standardInput": {
+ "type": "string"
+ },
+ "standardOutput": {
+ "type": "string"
+ },
+ "inputDataDirectory": {
+ "type": "string"
+ },
+ "outputDataDirectory": {
+ "type": "string"
+ },
+ "scratchWorkingDirectory": {
+ "type": "string"
+ },
+ "staticWorkingDirectory": {
+ "type": "string"
+ },
+ "jobType" :{
+ "type":"string"
+ },
+ "executable":{
+ "type":"string"
+ },
+ "executableType":{
+ "type":"string"
+ }
+ }
+ },
+ "hpcApplicationDeploymentType":{
+ "type": "object",
+ "properties": {
+ "authorInfo": {
+ "$ref": "http://airavata.apache.org/schemas/gfac/2012/12/authorInfoType"
+ },
+ "documentInfo": {
+ "$ref": "http://airavata.apache.org/schemas/gfac/2012/12/documentInfoType"
+ },
+ "applicationName": {
+ "@targetNamespace": {
+ "type": "string"
+ }
+ },
+ "executableLocation": {
+ "type": "string"
+ },
+ "applicationEnvironment": {
+ "type": "object",
+ "$ref": "http://airavata.apache.org/schemas/gfac/2012/12/nameValuePairType"
+ },
+ "standardError": {
+ "type": "string"
+ },
+ "standardInput": {
+ "type": "string"
+ },
+ "standardOutput": {
+ "type": "string"
+ },
+ "inputDataDirectory": {
+ "type": "string"
+ },
+ "outputDataDirectory": {
+ "type": "string"
+ },
+ "scratchWorkingDirectory": {
+ "type": "string"
+ },
+ "staticWorkingDirectory": {
+ "type": "string"
+ },
+ "jobType" :{
+ "type":"string"
+ },
+ "projectAccount":{
+ "$ref": "#definitions/projectAccountType"
+ },
+ "queue":{
+ "$ref": "#definitions/queueType"
+ },
+ "maxWallTime":{
+ "type":"integer"
+ },
+ "cpuCount":{
+ "type":"integer"
+ },
+ "noceCount":{
+ "type":"integer"
+ },
+ "processorsPerNode":{
+ "type":"integer"
+ },
+ "minMemory":{
+ "type":"integer"
+ },
+ "maxMemory":{
+ "type":"integer"
+ },
+ "keyValuePairs":{
+ "$ref": "#definitions/extendedKeyValueType"
+ }
+ }
+ },
+ "hadoopApplicationDeploymentDescriptionType":{
+ "type": "object",
+ "properties": {
+ "authorInfo": {
+ "$ref": "http://airavata.apache.org/schemas/gfac/2012/12/authorInfoType"
+ },
+ "documentInfo": {
+ "$ref": "http://airavata.apache.org/schemas/gfac/2012/12/documentInfoType"
+ },
+ "applicationName": {
+ "@targetNamespace": {
+ "type": "string"
+ }
+ },
+ "executableLocation": {
+ "type": "string"
+ },
+ "applicationEnvironment": {
+ "type": "object",
+ "$ref": "http://airavata.apache.org/schemas/gfac/2012/12/nameValuePairType"
+ },
+ "standardError": {
+ "type": "string"
+ },
+ "standardInput": {
+ "type": "string"
+ },
+ "standardOutput": {
+ "type": "string"
+ },
+ "inputDataDirectory": {
+ "type": "string"
+ },
+ "outputDataDirectory": {
+ "type": "string"
+ },
+ "scratchWorkingDirectory": {
+ "type": "string"
+ },
+ "staticWorkingDirectory": {
+ "type": "string"
+ },
+ "jarLocation":{
+ "type":"string"
+ },
+ "jobName":{
+ "type":"string"
+ },
+ "combinerClass":{
+ "type":"string"
+ },
+ "mapperClass":{
+ "type":"string"
+ },
+ "reducerClass":{
+ "type":"string"
+ },
+ "inputFormatClass":{
+ "type":"string"
+ },
+ "outputFormatClass":{
+ "type":"string"
+ },
+ "mapOutputKeyClass":{
+ "type":"string"
+ },
+ "mapOutputValueClass":{
+ "type":"string"
+ },
+ "outputKeyClass":{
+ "type":"string"
+ },
+ "outputValueClass":{
+ "type":"string"
+ },
+ "numReduceTasks":{
+ "type":"integer"
+ },
+ "partitionerClass":{
+ "type":"string"
+ },
+ "hdfsInputDirectory":{
+ "type":"string"
+ },
+ "hdfsOutputDirectory":{
+ "type":"string"
+ }
+ }
+ },
+ "projectAccountType":{
+ "type":"object",
+ "properties":{
+ "projectAccountNumber":{
+ "type":"string"
+ },
+ "projectAccountDescription":{
+ "type":"string"
+ },
+ "anyMetadata": {
+ "type": "array",
+ "items": {
+ "$ref": "http://airavata.apache.org/schemas/gfac/2012/12/anyMetadata"
+ }
+ }
+ }
+ },
+ "queueType":{
+ "type":"object",
+ "require":["queueName"],
+ "properties":{
+ "queueName":{
+ "type":"string"
+ },
+ "queueDescription":{
+ "type":"string"
+ }
+ }
+ },
+ "extendedKeyValueType":{
+ "type":"string",
+ "require":["@name"],
+ "properties":{
+ "@name":{
+ "type":"string"
+ }
+ }
+ }
+ }
+}
Added: airavata/sandbox/gsoc2013/app/scripts/model/anyMetadata.json
URL: http://svn.apache.org/viewvc/airavata/sandbox/gsoc2013/app/scripts/model/anyMetadata.json?rev=1529827&view=auto
==============================================================================
--- airavata/sandbox/gsoc2013/app/scripts/model/anyMetadata.json (added)
+++ airavata/sandbox/gsoc2013/app/scripts/model/anyMetadata.json Mon Oct 7 12:56:36 2013
@@ -0,0 +1,13 @@
+{
+ "$schema": "http://json-schema.org/draft-04/schema#",
+ "title": "AnyMetadata Schema",
+ "description":"JSON schema for AnyMetadata",
+ "type": "object",
+ "id": "http://airavata.apache.org/schemas/gfac/2012/12/anyMetadata",
+ "required": ["anyMetadata"],
+ "properties": {
+ "anyMetadata":{
+ "type": "object"
+ }
+ }
+}
\ No newline at end of file
Added: airavata/sandbox/gsoc2013/app/scripts/model/authorInfoType.json
URL: http://svn.apache.org/viewvc/airavata/sandbox/gsoc2013/app/scripts/model/authorInfoType.json?rev=1529827&view=auto
==============================================================================
--- airavata/sandbox/gsoc2013/app/scripts/model/authorInfoType.json (added)
+++ airavata/sandbox/gsoc2013/app/scripts/model/authorInfoType.json Mon Oct 7 12:56:36 2013
@@ -0,0 +1,34 @@
+{
+ "$schema": "http://json-schema.org/draft-04/schema#",
+ "title": "AuthorInfoType Schema",
+ "description": "JSON schema for AuthorInfoType",
+ "type": "object",
+ "id": "http://airavata.apache.org/schemas/gfac/2012/12#authorInfo",
+ "required": ["authorInfoType"],
+ "properties": {
+ "authorInfoType": {
+ "type": "object",
+ "id": "http://airavata.apache.org/schemas/gfac/2012/12/authorInfoType",
+ "properties": {
+ "author": {
+ "type": "string"
+ },
+ "modificationDate": {
+ "type": "string"
+ },
+ "organization": {
+ "type": "string"
+ },
+ "address": {
+ "type": "string"
+ },
+ "contactInfo": {
+ "type": "string"
+ },
+ "anyMetadata": {
+ "type": "object"
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
Added: airavata/sandbox/gsoc2013/app/scripts/model/documentInfoType.json
URL: http://svn.apache.org/viewvc/airavata/sandbox/gsoc2013/app/scripts/model/documentInfoType.json?rev=1529827&view=auto
==============================================================================
--- airavata/sandbox/gsoc2013/app/scripts/model/documentInfoType.json (added)
+++ airavata/sandbox/gsoc2013/app/scripts/model/documentInfoType.json Mon Oct 7 12:56:36 2013
@@ -0,0 +1,37 @@
+{
+ "$schema": "http://json-schema.org/draft-04/schema#",
+ "title": "DocumentInfoType Schema",
+ "description": "JSON schema for DocumentInfoType",
+ "type": "object",
+ "id": "http://airavata.apache.org/schemas/gfac/2012/12/documentInfoType",
+ "required": ["documentInfoType"],
+ "properties": {
+ "documentInfoType": {
+ "type":"object",
+ "required":["documentName"],
+ "properties":{
+ "documentName": {
+ "type":"object",
+ "required":["@targetNamespace"],
+ "properties":{
+ "@targetNamespace": {
+ "type":"string"
+ }
+ }
+ },
+ "creationDate": { // TODO dateTime
+ "type":"string"
+ },
+ "documentDescription": {
+ "type":"string"
+ },
+ "anyMetadata": {
+ "type": "array",
+ "items": {
+ "$ref": "http://airavata.apache.org/schemas/gfac/2012/12/anyMetadata"
+ }
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
Added: airavata/sandbox/gsoc2013/app/scripts/model/nameValuePairType.json
URL: http://svn.apache.org/viewvc/airavata/sandbox/gsoc2013/app/scripts/model/nameValuePairType.json?rev=1529827&view=auto
==============================================================================
--- airavata/sandbox/gsoc2013/app/scripts/model/nameValuePairType.json (added)
+++ airavata/sandbox/gsoc2013/app/scripts/model/nameValuePairType.json Mon Oct 7 12:56:36 2013
@@ -0,0 +1,27 @@
+{
+ "$schema": "http://json-schema.org/draft-04/schema#",
+ "title": "Name Value Pair Type schema",
+ "description": "JSON schema for Name Value Pair Type",
+ "type": "object",
+ "id": "http://airavata.apache.org/schemas/gfac/2012/12#nameValuePairType",
+ "required": ["authorInfoType"],
+ "properties": {
+ "nameValuePairType": {
+ "type": "object",
+ "id": "http://jsonschema.net/applicationDeploymentDescription/applicationEnvironment",
+ "required": ["name" , "value"],
+ "properties": {
+ "name": {
+ "type": "string"
+ },
+ "value": {
+ "type": "string"
+ },
+ "description": {
+ "type": "string"
+ }
+ }
+ }
+ }
+
+}
\ No newline at end of file
Added: airavata/sandbox/gsoc2013/app/scripts/model/serviceDescription.json
URL: http://svn.apache.org/viewvc/airavata/sandbox/gsoc2013/app/scripts/model/serviceDescription.json?rev=1529827&view=auto
==============================================================================
--- airavata/sandbox/gsoc2013/app/scripts/model/serviceDescription.json (added)
+++ airavata/sandbox/gsoc2013/app/scripts/model/serviceDescription.json Mon Oct 7 12:56:36 2013
@@ -0,0 +1,191 @@
+{
+ "type":"object",
+ "$schema": "http://json-schema.org/draft-04/schema#",
+ "id": "http://airavata.apache.org/schemas/gfac/2012/12/serviceDescription",
+ "properties":{
+ "serviceDescription": {
+ "$ref": "#/definitions/serviceDescriptionType"
+ }
+ },
+ "definitions":{
+ "serviceDescriptionType":{
+ "type":"object",
+ "id": "http://jsonschema.net/serviceDescription",
+ "required":["service", "portType"],
+ "properties":{
+ "name": {
+ "type":"string"
+ },
+ "description": {
+ "type":"string"
+ },
+ "service": {
+ "$ref": "#/definitions/serviceType"
+ },
+ "portType": {
+ "$ref": "#/definitions/portTypeType"
+ },
+ "authorInfo": {
+ "type": "array",
+ "items": {
+ "$ref": "http://airavata.apache.org/schemas/gfac/2012/12/authorInfoType"
+ }
+ },
+ "documentInfo": {
+ "$ref": "#/definitions/documentInfoType"
+ },
+ "inputParameters": {
+ "type" : "array",
+ "items": {
+ "$ref" : "#/definitions/inputParameterType"
+ }
+ },
+ "outputParameters": {
+ "type":"array",
+ "items": {
+ "$ref" : "#/definitions/outputParameterType"
+ }
+
+ }
+ }
+
+ },
+ "serviceType": {
+ "type":"object",
+ "required":["serviceName"],
+ "properties":{
+ "serviceName": {
+ "type":"object",
+ "required":["@targetNamespace"],
+ "properties":{
+ "@targetNamespace": {
+ "type":"string"
+ }
+ }
+ },
+ "serviceDescription": {
+ "type":"string"
+ },
+ "anyMetadata": {
+ "type": "array",
+ "items": {
+ "$ref": "http://airavata.apache.org/schemas/gfac/2012/12/anyMetadata"
+ }
+ }
+ }
+ },
+ "documentInfoType": {
+ "$ref" : "http://airavata.apache.org/schemas/gfac/2012/12/documentInfoType"
+ },
+ "inputParameterType": {
+ "type":"array",
+ "required":["parameterName", "parameterType"],
+ "properties":{
+ "parameterName": {
+ "type":"string"
+ },
+ "parameterDescription": {
+ "type":"string"
+ },
+ "parameterType": {
+ "type":"object",
+ "properties":{
+ "@type": {
+ "type":"string"
+ },
+ "name": {
+ "type":"string"
+ }
+ }
+ },
+ "anyMetadata": {
+ "type": "array",
+ "items": {
+ "$ref": "http://airavata.apache.org/schemas/gfac/2012/12/anyMetadata"
+ }
+ },
+ "parameterValue": {
+ "type":"array",
+ "items":{
+ "type":"string"
+ }
+ }
+ }
+ },
+ "outputParameterType": {
+ "type":"object",
+ "required":["parameterName", "parameterType"],
+ "properties":{
+ "parameterName": {
+ "type":"string"
+ },
+ "parameterDescription": {
+ "type":"string"
+ },
+ "parameterType": {
+ "type":"object",
+ "properties":{
+ "@type": {
+ "type":"string"
+ },
+ "name": {
+ "type":"string"
+ }
+ }
+ },
+ "anyMetadata": {
+ "type": "array",
+ "items": {
+ "$ref": "http://airavata.apache.org/schemas/gfac/2012/12/anyMetadata"
+ }
+ },
+ "stdOutRegExp": {
+ "type":"array",
+ "items":{
+ "type":"string"
+ }
+ }
+ }
+ },
+ "portTypeType": {
+ "type":"object",
+ "id": "http://jsonschema.net/serviceDescription/portType",
+ "required":["method"],
+ "properties":{
+ "portName": {
+ "type":"string"
+ },
+ "portDescription": {
+ "type":"string"
+ },
+ "method": {
+ "$ref": "#/definitions/methodType"
+ },
+ "anyMetadata": {
+ "type": "array",
+ "items": {
+ "$ref": "http://airavata.apache.org/schemas/gfac/2012/12/anyMetadata"
+ }
+ }
+ }
+ },
+ "methodType": {
+ "type":"object",
+ "required":["methodName"],
+ "properties":{
+ "methodName": {
+ "type":"string"
+ },
+ "methodDescription": {
+ "type":"string"
+ },
+ "anyMetadata": {
+ "type": "array",
+ "items": {
+ "$ref": "http://airavata.apache.org/schemas/gfac/2012/12/anyMetadata"
+ }
+ }
+ }
+ }
+ }
+}