You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2014/06/30 16:48:44 UTC
[1/2] git commit: updating the workflownodedetails with type
Repository: airavata
Updated Branches:
refs/heads/master c1718d6a7 -> 714702096
updating the workflownodedetails with type
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/673c0fc3
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/673c0fc3
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/673c0fc3
Branch: refs/heads/master
Commit: 673c0fc366b00377d7432dfd5dc215f9b7eb0540
Parents: e565ae4
Author: Saminda Wijeratne <sa...@gmail.com>
Authored: Mon Jun 30 10:47:32 2014 -0400
Committer: Saminda Wijeratne <sa...@gmail.com>
Committed: Mon Jun 30 10:47:32 2014 -0400
----------------------------------------------------------------------
.../experimentModel.thrift | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/673c0fc3/airavata-api/thrift-interface-descriptions/experimentModel.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/experimentModel.thrift b/airavata-api/thrift-interface-descriptions/experimentModel.thrift
index a1a5105..6d4ecb5 100644
--- a/airavata-api/thrift-interface-descriptions/experimentModel.thrift
+++ b/airavata-api/thrift-interface-descriptions/experimentModel.thrift
@@ -314,6 +314,13 @@ struct TaskDetails {
15: optional list<ErrorDetails> errors
}
+enum ExecutionUnit {
+ INPUT,
+ APPLICATION,
+ OUTPUT
+}
+
+
/**
* A structure holding the node data.
* nodeInstanceId - unique node identifier for each run
@@ -322,11 +329,13 @@ struct WorkflowNodeDetails {
1: required string nodeInstanceId = DEFAULT_ID,
2: optional i64 creationTime,
3: required string nodeName = SINGLE_APP_NODE_NAME,
- 4: optional list<DataObjectType> nodeInputs,
- 5: optional list<DataObjectType> nodeOutputs,
- 6: optional WorkflowNodeStatus workflowNodeStatus,
- 7: optional list<TaskDetails> taskDetailsList,
- 8: optional list<ErrorDetails> errors
+ 4: required ExecutionUnit = ExecutionUnit.APPLICATION,
+ 5: optional string executionUnitData,
+ 6: optional list<DataObjectType> nodeInputs,
+ 7: optional list<DataObjectType> nodeOutputs,
+ 8: optional WorkflowNodeStatus workflowNodeStatus,
+ 9: optional list<TaskDetails> taskDetailsList,
+ 10: optional list<ErrorDetails> errors
}
/**
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by sa...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/71470209
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/71470209
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/71470209
Branch: refs/heads/master
Commit: 714702096b5c0c1670bbd3275e88becfe00de7c4
Parents: 673c0fc c1718d6
Author: Saminda Wijeratne <sa...@gmail.com>
Authored: Mon Jun 30 10:48:31 2014 -0400
Committer: Saminda Wijeratne <sa...@gmail.com>
Committed: Mon Jun 30 10:48:31 2014 -0400
----------------------------------------------------------------------
.../airavata/api/server/AiravataAPIServer.java | 8 +-
.../api/server/ApplicationCatalogServer.java | 6 +-
.../handler/ApplicationCatalogHandler.java | 4 +-
.../api/server/util/AppCatalogInitUtil.java | 166 +
.../api/server/util/DatabaseCreator.java | 6 +-
.../api/server/util/RegistryInitUtil.java | 2 +-
.../api/appcatalog/ApplicationCatalogAPI.java | 26216 -----------------
.../applicationCatalogAPIConstants.java | 55 -
.../api/client/AiravataClientFactory.java | 6 +-
.../resources/lib/ApplicationCatalogAPI.cpp | 2253 +-
.../main/resources/lib/ApplicationCatalogAPI.h | 690 +-
.../ApplicationCatalogAPI_server.skeleton.cpp | 28 +-
.../resources/lib/applicationCatalogAPI_types.h | 4 +-
.../applicationDeploymentModel_constants.cpp | 19 +
.../lib/applicationDeploymentModel_constants.h | 25 +
.../lib/applicationDeploymentModel_types.cpp | 477 +
.../lib/applicationDeploymentModel_types.h | 269 +
.../lib/applicationInterfaceModel_constants.cpp | 19 +
.../lib/applicationInterfaceModel_constants.h | 25 +
.../lib/applicationInterfaceModel_types.cpp | 504 +
.../lib/applicationInterfaceModel_types.h | 308 +
.../lib/computeHostModel_constants.cpp | 19 +
.../resources/lib/computeHostModel_constants.h | 25 +
.../resources/lib/computeHostModel_types.cpp | 1025 +
.../main/resources/lib/computeHostModel_types.h | 534 +
.../API/AppCatalog/ApplicationCatalogAPI.php | 1257 +-
.../java-client-samples/pom.xml | 7 +-
.../model/appcatalog/ApplicationDeployment.java | 600 -
.../model/appcatalog/ApplicationDescriptor.java | 506 -
.../model/appcatalog/ApplicationInterface.java | 658 -
.../appcatalog/ComputeResourceDescription.java | 1537 -
.../model/appcatalog/DataMovementProtocol.java | 83 -
.../model/appcatalog/GSISSHJobSubmission.java | 1262 -
.../model/appcatalog/GlobusJobSubmission.java | 768 -
.../model/appcatalog/GridFTPDataMovement.java | 651 -
.../model/appcatalog/JobSubmissionProtocol.java | 80 -
.../model/appcatalog/ResourceJobManager.java | 83 -
.../model/appcatalog/SCPDataMovement.java | 610 -
.../model/appcatalog/SSHJobSubmission.java | 610 -
.../model/appcatalog/SecurityProtocol.java | 82 -
.../ApplicationDeploymentDescription.java | 1479 +
.../appdeployment/ApplicationModule.java | 811 +
.../appcatalog/appdeployment/SetEnvPaths.java | 500 +
.../applicationDeploymentModelConstants.java | 55 +
.../ApplicationInterfaceDescription.java | 1063 +
.../model/appcatalog/appinterface/DataType.java | 71 +
.../appinterface/InputDataObjectType.java | 1134 +
.../appinterface/OutputDataObjectType.java | 735 +
.../applicationInterfaceModelConstants.java | 55 +
.../applicationCatalogDataModelConstants.java | 55 -
.../gatewayprofile/GatewayProfile.java | 722 +
.../gatewayProfileModelConstants.java | 55 +
.../computehost/ComputeResourceDescription.java | 1436 +
.../model/computehost/DataMovementProtocol.java | 83 +
.../model/computehost/GSISSHJobSubmission.java | 1262 +
.../model/computehost/GlobusJobSubmission.java | 768 +
.../model/computehost/GridFTPDataMovement.java | 651 +
.../computehost/JobSubmissionProtocol.java | 80 +
.../model/computehost/ResourceJobManager.java | 83 +
.../model/computehost/SCPDataMovement.java | 610 +
.../model/computehost/SSHJobSubmission.java | 610 +
.../model/computehost/SecurityProtocol.java | 82 +
.../computehost/computeHostModelConstants.java | 55 +
airavata-api/generate-thrift-files.sh | 2 +-
.../appCatalogModels.thrift | 24 +
.../applicationCatalogAPI.thrift | 9 +-
.../applicationDeploymentModel.thrift | 4 +-
.../applicationInterfaceModel.thrift | 10 +-
.../gatewayProfileModel.thrift | 4 +-
.../org/airavata/appcatalog/cpi/AppCatalog.java | 21 +
.../appcatalog/cpi/ApplicationDeployment.java | 42 +
.../appcatalog/cpi/ApplicationInterface.java | 85 +
.../appcatalog/cpi/ComputeResource.java | 169 +
modules/app-catalog/app-catalog-data/pom.xml | 5 -
.../catalog/data/impl/AppCatalogImpl.java | 44 +
.../data/impl/ApplicationDeploymentImpl.java | 57 +
.../data/impl/ApplicationInterfaceImpl.java | 88 +
.../catalog/data/impl/ComputeResourceImpl.java | 405 +
.../catalog/data/model/AppEnvironment.java | 3 +-
.../catalog/data/model/AppEnvironment_PK.java | 4 +-
.../catalog/data/model/AppInput_PK.java | 4 +-
.../catalog/data/model/AppModuleMapping.java | 3 +-
.../catalog/data/model/AppModuleMapping_PK.java | 4 +-
.../catalog/data/model/AppOutput_PK.java | 4 +-
.../data/model/ApplicationDeployment.java | 3 +-
.../catalog/data/model/ApplicationInput.java | 3 +-
.../data/model/ApplicationInterface.java | 3 +-
.../catalog/data/model/ApplicationModule.java | 3 +-
.../catalog/data/model/ApplicationOutput.java | 3 +-
.../catalog/data/model/ComputeResource.java | 13 +-
.../data/model/DataMovementProtocol.java | 15 +-
.../data/model/DataMovementProtocolPK.java | 18 +-
.../catalog/data/model/GSISSHExport.java | 11 +-
.../catalog/data/model/GSISSHExportPK.java | 4 +-
.../data/model/GSISSHPostJobCommand.java | 15 +-
.../data/model/GSISSHPostJobCommandPK.java | 4 +-
.../catalog/data/model/GSISSHPreJobCommand.java | 15 +-
.../data/model/GSISSHPreJobCommandPK.java | 4 +-
.../catalog/data/model/GSISSHSubmission.java | 3 +-
.../catalog/data/model/GatewayProfile.java | 3 +-
.../catalog/data/model/GlobusGKEndPointPK.java | 64 +
.../catalog/data/model/GlobusGKEndpoint.java | 65 +
.../catalog/data/model/GlobusJobSubmission.java | 13 +-
.../catalog/data/model/GridFTPDMEndPointPK.java | 64 +
.../catalog/data/model/GridFTPDMEndpoint.java | 65 +
.../catalog/data/model/GridFTPDataMovement.java | 3 +-
.../catalog/data/model/HostAlias.java | 3 +-
.../catalog/data/model/HostAliasPK.java | 4 +-
.../catalog/data/model/HostIPAddress.java | 3 +-
.../catalog/data/model/HostIPAddressPK.java | 4 +-
.../data/model/JobSubmissionProtocol.java | 3 +-
.../data/model/JobSubmissionProtocolPK.java | 4 +-
.../catalog/data/model/LibraryApendPath.java | 3 +-
.../catalog/data/model/LibraryApendPath_PK.java | 4 +-
.../catalog/data/model/LibraryPrepandPath.java | 3 +-
.../data/model/LibraryPrepandPath_PK.java | 4 +-
.../catalog/data/model/SCPDataMovement.java | 3 +-
.../catalog/data/model/SSHSubmission.java | 3 +-
.../data/resources/AbstractResource.java | 22 +-
.../data/resources/AppEnvironmentResource.java | 280 +
.../data/resources/AppInterfaceResource.java | 253 +
.../resources/AppModuleMappingResource.java | 282 +
.../resources/ApplicationInputResource.java | 380 +
.../resources/ApplicationOutputResource.java | 359 +
.../data/resources/ComputeHostResource.java | 11 -
.../resources/DataMovementProtocolResource.java | 333 +
.../data/resources/GSISSHExportResource.java | 296 +
.../resources/GSISSHPostJobCommandResource.java | 306 +
.../resources/GSISSHPreJobCommandResource.java | 305 +
.../resources/GSISSHSubmissionResource.java | 406 +
.../data/resources/GatewayProfileResource.java | 271 +
.../resources/GlobusGKEndpointResource.java | 292 +
.../resources/GlobusJobSubmissionResource.java | 362 +
.../resources/GridFTPDMEndpointResource.java | 295 +
.../resources/GridFTPDataMovementResource.java | 333 +
.../data/resources/HostAliasResource.java | 108 +-
.../data/resources/HostIPAddressResource.java | 301 +
.../JobSubmissionProtocolResource.java | 333 +
.../resources/LibraryApendPathResource.java | 8 +-
.../data/resources/SCPDataMovementResource.java | 333 +
.../data/resources/SSHSubmissionResource.java | 331 +
.../catalog/data/util/AppCatalogJPAUtils.java | 294 +-
.../data/util/AppCatalogResourceType.java | 2 +
.../data/util/AppCatalogThriftConversion.java | 76 +
.../catalog/data/util/AppCatalogUtils.java | 31 +
.../src/main/resources/META-INF/persistence.xml | 2 +
.../src/main/resources/appcatalog-derby.sql | 25 +-
.../src/main/resources/appcatalog-mysql.sql | 25 +-
modules/app-catalog/app-catalog-jpa/pom.xml | 131 -
.../appcatalog/jpa/model/Application.java | 77 -
.../jpa/model/ApplicationDeployment.java | 69 -
.../jpa/model/ApplicationDeploymentPK.java | 40 -
.../jpa/model/ApplicationInputOutputs.java | 68 -
.../jpa/model/ApplicationInputOutputsPK.java | 39 -
.../appcatalog/jpa/model/ComputeResource.java | 68 -
.../jpa/model/DataMovementProtocol.java | 75 -
.../jpa/model/DataMovementProtocolPK.java | 72 -
.../appcatalog/jpa/model/Deployment.java | 152 -
.../appcatalog/jpa/model/GSISSHExport.java | 64 -
.../appcatalog/jpa/model/GSISSHExportPK.java | 62 -
.../jpa/model/GSISSHPostJobCommand.java | 66 -
.../jpa/model/GSISSHPostJobCommandPK.java | 62 -
.../jpa/model/GSISSHPreJobCommand.java | 64 -
.../jpa/model/GSISSHPreJobCommandPK.java | 62 -
.../appcatalog/jpa/model/GSISSHSubmission.java | 102 -
.../jpa/model/GatewayApplications.java | 68 -
.../jpa/model/GatewayApplicationsPK.java | 40 -
.../appcatalog/jpa/model/GatewayProfile.java | 43 -
.../jpa/model/GlobusJobSubmission.java | 92 -
.../appcatalog/jpa/model/InputOutputs.java | 67 -
.../jpa/model/JobSubmissionProtocol.java | 76 -
.../jpa/model/JobSubmissionProtocolPK.java | 72 -
.../appcatalog/jpa/model/SCPDataMovement.java | 82 -
.../appcatalog/jpa/model/SSHSubmission.java | 82 -
.../src/main/resources/META-INF/persistence.xml | 28 -
.../src/main/resources/appcatalog-mysql_new.sql | 203 -
modules/commons/pom.xml | 4 +-
.../airavata/common/utils/AiravataZKUtils.java | 9 +
modules/distribution/server/pom.xml | 5 -
.../server/src/main/assembly/bin-assembly.xml | 9 +
.../apache/airavata/gfac/server/GfacServer.java | 4 +-
modules/gfac/gfac-bes/pom.xml | 8 +
.../gfac/core/context/JobExecutionContext.java | 11 +
.../airavata/gfac/core/cpi/BetterGfacImpl.java | 1 +
.../core/handler/AppDescriptorCheckHandler.java | 1 -
.../airavata/gfac/core/utils/GFacUtils.java | 29 +-
modules/gfac/gfac-gsissh/pom.xml | 5 +
.../gsissh/security/GSISecurityContext.java | 206 +-
.../security/TokenizedMyProxyAuthInfo.java | 291 +
.../gfac/gsissh/util/GFACGSISSHUtils.java | 41 +-
.../GSISecurityContextTestWithMyProxyAuth.java | 14 +-
.../orchestrator/server/OrchestratorServer.java | 4 +-
.../server/OrchestratorServerHandler.java | 4 +-
modules/orchestrator/orchestrator-core/pom.xml | 5 -
.../core/impl/GFACEmbeddedJobSubmitter.java | 13 +-
.../core/impl/GFACServiceJobSubmitter.java | 16 +-
.../orchestrator/core/job/JobSubmitter.java | 11 +
.../airavata/orchestrator/cpi/Orchestrator.java | 2 +-
.../cpi/impl/SimpleOrchestratorImpl.java | 4 +-
.../orchestrator/core/NewOrchestratorTest.java | 2 +-
.../core/OrchestratorTestWithMyProxyAuth.java | 2 +-
modules/registry/airavata-jpa-registry/pom.xml | 7 +-
modules/ws-messenger/pom.xml | 2 +-
pom.xml | 28 +-
204 files changed, 27948 insertions(+), 36939 deletions(-)
----------------------------------------------------------------------