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/d9d3546d Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d9d3546d Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d9d3546d Branch: refs/heads/master Commit: d9d3546d64a6f1689eb250075677a3066833294f Parents: 6151527 d5b1b2d Author: lahiru <[email protected]> Authored: Tue Jul 22 11:56:56 2014 -0400 Committer: lahiru <[email protected]> Committed: Tue Jul 22 11:56:56 2014 -0400 ---------------------------------------------------------------------- airavata-api/airavata-api-server/pom.xml | 2 +- airavata-api/airavata-api-stubs/pom.xml | 2 +- .../java/org/apache/airavata/api/Airavata.java | 33 +- .../airavata/api/airavataAPIConstants.java | 33 +- .../apache/airavata/api/workflow/Workflow.java | 33 +- .../api/workflow/workflowAPIConstants.java | 33 +- .../airavata-cpp-sdk/pom.xml | 2 +- .../main/resources/client_samples/compile.sh | 16 + .../client_samples/createExperiment.cpp | 17 + .../resources/client_samples/createProject.cpp | 17 + .../client_samples/getExperimentOutputs.cpp | 17 + .../client_samples/getExperimentStatus.cpp | 17 + .../client_samples/launchExperiment.cpp | 17 + .../main/resources/lib/airavata/Airavata.cpp | 17 + .../src/main/resources/lib/airavata/Airavata.h | 17 + .../lib/airavata/Airavata_server.skeleton.cpp | 17 + .../lib/airavata/ApplicationCatalogAPI.cpp | 9387 ------------------ .../lib/airavata/ApplicationCatalogAPI.h | 4069 -------- .../ApplicationCatalogAPI_server.skeleton.cpp | 169 - .../main/resources/lib/airavata/Workflow.cpp | 17 + .../src/main/resources/lib/airavata/Workflow.h | 17 + .../lib/airavata/Workflow_server.skeleton.cpp | 17 + .../lib/airavata/airavataAPI_constants.cpp | 17 + .../lib/airavata/airavataAPI_constants.h | 17 + .../lib/airavata/airavataAPI_types.cpp | 17 + .../resources/lib/airavata/airavataAPI_types.h | 17 + .../airavata/airavataDataModel_constants.cpp | 17 + .../lib/airavata/airavataDataModel_constants.h | 17 + .../lib/airavata/airavataDataModel_types.cpp | 17 + .../lib/airavata/airavataDataModel_types.h | 17 + .../lib/airavata/airavataErrors_constants.cpp | 17 + .../lib/airavata/airavataErrors_constants.h | 17 + .../lib/airavata/airavataErrors_types.cpp | 17 + .../lib/airavata/airavataErrors_types.h | 17 + .../applicationCatalogAPI_constants.cpp | 19 - .../airavata/applicationCatalogAPI_constants.h | 25 - .../airavata/applicationCatalogAPI_types.cpp | 13 - .../lib/airavata/applicationCatalogAPI_types.h | 27 - .../applicationCatalogDataModel_constants.cpp | 19 - .../applicationCatalogDataModel_constants.h | 25 - .../applicationCatalogDataModel_types.cpp | 1327 --- .../applicationCatalogDataModel_types.h | 713 -- .../applicationDeploymentModel_constants.cpp | 17 + .../applicationDeploymentModel_constants.h | 17 + .../applicationDeploymentModel_types.cpp | 17 + .../airavata/applicationDeploymentModel_types.h | 17 + .../applicationInterfaceModel_constants.cpp | 17 + .../applicationInterfaceModel_constants.h | 17 + .../applicationInterfaceModel_types.cpp | 17 + .../airavata/applicationInterfaceModel_types.h | 17 + .../airavata/computeResourceModel_constants.cpp | 17 + .../airavata/computeResourceModel_constants.h | 17 + .../lib/airavata/computeResourceModel_types.cpp | 393 +- .../lib/airavata/computeResourceModel_types.h | 119 + .../lib/airavata/experimentModel_constants.cpp | 17 + .../lib/airavata/experimentModel_constants.h | 17 + .../lib/airavata/experimentModel_types.cpp | 17 + .../lib/airavata/experimentModel_types.h | 17 + .../airavata/gatewayProfileModel_constants.cpp | 19 - .../airavata/gatewayProfileModel_constants.h | 25 - .../lib/airavata/gatewayProfileModel_types.cpp | 293 - .../lib/airavata/gatewayProfileModel_types.h | 197 - .../gatewayResourceProfileModel_constants.cpp | 17 + .../gatewayResourceProfileModel_constants.h | 17 + .../gatewayResourceProfileModel_types.cpp | 17 + .../gatewayResourceProfileModel_types.h | 17 + .../lib/airavata/workflowAPI_constants.cpp | 17 + .../lib/airavata/workflowAPI_constants.h | 17 + .../lib/airavata/workflowAPI_types.cpp | 17 + .../resources/lib/airavata/workflowAPI_types.h | 17 + .../airavata/workflowDataModel_constants.cpp | 17 + .../lib/airavata/workflowDataModel_constants.h | 17 + .../lib/airavata/workflowDataModel_types.cpp | 17 + .../lib/airavata/workflowDataModel_types.h | 17 + .../lib/airavata/workspaceModel_constants.cpp | 17 + .../lib/airavata/workspaceModel_constants.h | 17 + .../lib/airavata/workspaceModel_types.cpp | 17 + .../lib/airavata/workspaceModel_types.h | 17 + .../airavata-php-sdk/pom.xml | 2 +- .../Model/AppCatalog/ComputeResource/Types.php | 224 + .../airavata-client-api-tester.php | 20 + .../php-cli-samples/cloneExperiment.php | 20 + .../php-cli-samples/createExperiment.php | 20 + .../resources/php-cli-samples/createProject.php | 20 + .../deleteApplicationInterface.php | 20 + .../php-cli-samples/deleteComputeResource.php | 20 + .../deleteGatewayComputeResourcePreference.php | 20 + .../resources/php-cli-samples/getAPIVersion.php | 19 + .../php-cli-samples/getAiravataClient.php | 20 + .../getAllApplicationInterfaceNames.php | 20 + .../getAllComputeResourceNames.php | 20 + .../getAllExperimentsInProject.php | 20 + .../php-cli-samples/getAllUserExperiments.php | 20 + .../php-cli-samples/getAllUserProjects.php | 20 + .../getApplicationDeployedResources.php | 19 + .../getApplicationDeployment.php | 20 + .../php-cli-samples/getApplicationInputs.php | 20 + .../php-cli-samples/getApplicationModule.php | 20 + .../php-cli-samples/getApplicationOutputs.php | 20 + ...getAvailableAppInterfaceComputeResources.php | 20 + .../php-cli-samples/getComputeResource.php | 20 + .../resources/php-cli-samples/getExperiment.php | 20 + .../php-cli-samples/getExperimentOutputs.php | 20 + .../php-cli-samples/getExperimentStatus.php | 20 + .../getGatewayComputeResourcePreference.php | 20 + .../php-cli-samples/launchExperiment.php | 20 + .../registerApplicationDeployment.php | 20 + .../registerApplicationInterface.php | 20 + .../registerApplicationModule.php | 20 + .../php-cli-samples/registerComputeResource.php | 20 + .../search_experiments_by_application.php | 20 + .../search_experiments_by_description.php | 20 + .../search_experiments_by_name.php | 20 + .../php-cli-samples/terminateExperiment.php | 20 + .../updateApplicationInterface.php | 20 + .../php-cli-samples/updateExperiment.php | 20 + .../resources/php-cli-samples/updateProject.php | 20 + .../java-client-samples/pom.xml | 2 +- .../samples/CreateLaunchExperimentUS3.java | 19 + airavata-api/airavata-client-sdks/pom.xml | 2 +- airavata-api/airavata-data-models/pom.xml | 2 +- .../org/apache/airavata/model/Workflow.java | 33 +- .../ApplicationDeploymentDescription.java | 33 +- .../appdeployment/ApplicationModule.java | 33 +- .../ApplicationParallelismType.java | 33 +- .../appcatalog/appdeployment/SetEnvPaths.java | 33 +- .../applicationDeploymentModelConstants.java | 33 +- .../ApplicationInterfaceDescription.java | 33 +- .../model/appcatalog/appinterface/DataType.java | 33 +- .../appinterface/InputDataObjectType.java | 33 +- .../appinterface/OutputDataObjectType.java | 33 +- .../applicationInterfaceModelConstants.java | 33 +- .../appcatalog/computeresource/BatchQueue.java | 33 +- .../ComputeResourceDescription.java | 33 +- .../computeresource/DataMovementInterface.java | 33 +- .../computeresource/DataMovementProtocol.java | 33 +- .../appcatalog/computeresource/FileSystems.java | 33 +- .../computeresource/GlobusJobSubmission.java | 33 +- .../computeresource/GridFTPDataMovement.java | 33 +- .../computeresource/JobManagerCommand.java | 33 +- .../computeresource/JobSubmissionInterface.java | 33 +- .../computeresource/JobSubmissionProtocol.java | 33 +- .../computeresource/LOCALDataMovement.java | 33 +- .../computeresource/LOCALSubmission.java | 33 +- .../computeresource/ResourceJobManager.java | 33 +- .../computeresource/ResourceJobManagerType.java | 33 +- .../computeresource/SCPDataMovement.java | 33 +- .../computeresource/SSHJobSubmission.java | 33 +- .../computeresource/SecurityProtocol.java | 35 +- .../computeResourceModelConstants.java | 33 +- .../ComputeResourcePreference.java | 33 +- .../gatewayprofile/GatewayResourceProfile.java | 33 +- .../gatewayResourceProfileModelConstants.java | 33 +- .../model/error/AiravataClientException.java | 33 +- .../airavata/model/error/AiravataErrorType.java | 33 +- .../model/error/AiravataSystemException.java | 33 +- .../model/error/AuthenticationException.java | 33 +- .../model/error/AuthorizationException.java | 33 +- .../error/ExperimentNotFoundException.java | 33 +- .../model/error/InvalidRequestException.java | 33 +- .../model/error/LaunchValidationException.java | 33 +- .../model/error/ProjectNotFoundException.java | 33 +- .../airavata/model/error/TimedOutException.java | 33 +- .../airavata/model/error/ValidationResults.java | 33 +- .../airavata/model/error/ValidatorResult.java | 33 +- .../model/workflowDataModelConstants.java | 33 +- .../airavata/model/workspace/Gateway.java | 33 +- .../apache/airavata/model/workspace/Group.java | 33 +- .../airavata/model/workspace/Project.java | 33 +- .../apache/airavata/model/workspace/User.java | 33 +- .../workspace/experiment/ActionableGroup.java | 33 +- .../experiment/AdvancedInputDataHandling.java | 33 +- .../experiment/AdvancedOutputDataHandling.java | 33 +- .../workspace/experiment/ApplicationStatus.java | 33 +- .../ComputationalResourceScheduling.java | 33 +- .../workspace/experiment/CorrectiveAction.java | 33 +- .../workspace/experiment/DataObjectType.java | 33 +- .../experiment/DataTransferDetails.java | 33 +- .../model/workspace/experiment/DataType.java | 33 +- .../workspace/experiment/ErrorCategory.java | 33 +- .../workspace/experiment/ErrorDetails.java | 33 +- .../workspace/experiment/ExecutionUnit.java | 33 +- .../model/workspace/experiment/Experiment.java | 33 +- .../workspace/experiment/ExperimentState.java | 33 +- .../workspace/experiment/ExperimentStatus.java | 33 +- .../workspace/experiment/ExperimentSummary.java | 33 +- .../model/workspace/experiment/JobDetails.java | 33 +- .../model/workspace/experiment/JobState.java | 33 +- .../model/workspace/experiment/JobStatus.java | 33 +- .../experiment/QualityOfServiceParams.java | 33 +- .../model/workspace/experiment/TaskDetails.java | 33 +- .../model/workspace/experiment/TaskState.java | 33 +- .../model/workspace/experiment/TaskStatus.java | 33 +- .../workspace/experiment/TransferState.java | 33 +- .../workspace/experiment/TransferStatus.java | 33 +- .../experiment/UserConfigurationData.java | 33 +- .../workspace/experiment/ValidationResults.java | 33 +- .../workspace/experiment/ValidatorResult.java | 33 +- .../experiment/WorkflowNodeDetails.java | 33 +- .../workspace/experiment/WorkflowNodeState.java | 33 +- .../experiment/WorkflowNodeStatus.java | 33 +- .../experiment/experimentModelConstants.java | 33 +- airavata-api/airavata-model-utils/pom.xml | 2 +- .../airavata/model/util/ProjectModelUtil.java | 19 + airavata-api/generate-thrift-files.sh | 52 +- airavata-api/pom.xml | 2 +- .../computeResourceModel.thrift | 26 + modules/airavata-client/pom.xml | 2 +- .../airavata/client/AiravataAPIFactory.java | 4 +- .../client/tools/UltrascanDocumentCreator.java | 19 + modules/app-catalog/app-catalog-cpi/pom.xml | 5 +- .../org/airavata/appcatalog/cpi/AppCatalog.java | 19 + .../appcatalog/cpi/AppCatalogException.java | 19 + .../appcatalog/cpi/ApplicationDeployment.java | 19 + .../appcatalog/cpi/ApplicationInterface.java | 19 + .../appcatalog/cpi/ComputeResource.java | 19 + .../appcatalog/cpi/GwyResourceProfile.java | 19 + modules/app-catalog/app-catalog-data/pom.xml | 2 +- .../resources/ApplicationInputResource.java | 19 + .../resources/ApplicationOutputResource.java | 19 + .../resources/DataMovementProtocolResource.java | 19 + .../data/resources/GSISSHExportResource.java | 19 + .../resources/GSISSHPostJobCommandResource.java | 19 + .../resources/GSISSHPreJobCommandResource.java | 19 + .../resources/GSISSHSubmissionResource.java | 19 + .../data/resources/GatewayProfileResource.java | 19 + .../resources/GlobusGKEndpointResource.java | 19 + .../resources/GlobusJobSubmissionResource.java | 19 + .../resources/GridftpDataMovementResource.java | 19 + .../data/resources/GridftpEndpointResource.java | 19 + .../data/resources/HostAliasResource.java | 19 + .../data/resources/HostIPAddressResource.java | 19 + .../JobSubmissionProtocolResource.java | 19 + .../data/resources/ScpDataMovementResource.java | 19 + .../resources/SshJobSubmissionResource.java | 19 + modules/app-catalog/pom.xml | 2 +- modules/commons/gfac-schema/pom.xml | 2 +- modules/commons/pom.xml | 2 +- modules/commons/utils/pom.xml | 5 +- .../commons/workflow-execution-context/pom.xml | 2 +- modules/commons/workflow-tracking/pom.xml | 2 +- modules/configuration/client/pom.xml | 2 +- modules/configuration/pom.xml | 2 +- modules/configuration/server/pom.xml | 2 +- .../credential-store-webapp/pom.xml | 2 +- .../credential-store/pom.xml | 2 +- modules/credential-store-service/pom.xml | 2 +- modules/distribution/client/java/pom.xml | 2 +- modules/distribution/client/pom.xml | 2 +- modules/distribution/pom.xml | 2 +- modules/distribution/release/pom.xml | 2 +- modules/distribution/server/pom.xml | 2 +- modules/gfac/airavata-gfac-service/pom.xml | 2 +- .../src/test/resources/monitor.properties | 20 + modules/gfac/gfac-bes/pom.xml | 2 +- modules/gfac/gfac-core/pom.xml | 2 +- modules/gfac/gfac-ec2/pom.xml | 2 +- modules/gfac/gfac-gram/pom.xml | 2 +- modules/gfac/gfac-gsissh/pom.xml | 2 +- modules/gfac/gfac-hadoop/pom.xml | 2 +- modules/gfac/gfac-local/pom.xml | 2 +- modules/gfac/gfac-monitor/pom.xml | 5 +- modules/gfac/gfac-ssh/pom.xml | 5 +- modules/gfac/pom.xml | 2 +- .../airavata-orchestrator-service/pom.xml | 2 +- .../orchestrator-client-sdks/pom.xml | 2 +- modules/orchestrator/orchestrator-core/pom.xml | 2 +- .../core/model/ExperimentConfigurationData.java | 19 + .../core/model/ResourceScheduling.java | 19 + modules/orchestrator/pom.xml | 2 +- modules/registry/airavata-jpa-registry/pom.xml | 2 +- .../registry/jpa/TaskDetailResourceTest.java | 19 + .../jpa/WorkflowNodeDetailResourceTest.java | 19 + modules/registry/pom.xml | 2 +- modules/registry/registry-api/pom.xml | 2 +- .../api/orchestrator/OrchestratorData.java | 19 + .../orchestrator/impl/OrchestratorDataImpl.java | 19 + modules/registry/registry-cpi/pom.xml | 2 +- .../airavata/registry/cpi/ChildDataType.java | 19 + .../airavata/registry/cpi/ParentDataType.java | 19 + .../apache/airavata/registry/cpi/Registry.java | 19 + .../registry/cpi/RegistryModelType.java | 19 + .../airavata/registry/cpi/utils/StatusType.java | 19 + modules/security/pom.xml | 2 +- modules/server/pom.xml | 2 +- modules/test-suite/pom.xml | 2 +- modules/workflow-model/pom.xml | 2 +- .../workflow-model/workflow-model-core/pom.xml | 2 +- modules/ws-messenger/client/pom.xml | 2 +- modules/ws-messenger/commons/pom.xml | 2 +- modules/ws-messenger/message-monitor/pom.xml | 2 +- modules/ws-messenger/pom.xml | 2 +- pom.xml | 2 +- tools/gsissh/pom.xml | 2 +- tools/pom.xml | 2 +- tools/registry-tool/pom.xml | 2 +- 296 files changed, 4591 insertions(+), 17873 deletions(-) ----------------------------------------------------------------------
