You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2016/02/08 17:49:32 UTC

[50/50] [abbrv] airavata git commit: update generated code and fixing compilation issues

update generated code and fixing compilation issues


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/4c790770
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/4c790770
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/4c790770

Branch: refs/heads/master
Commit: 4c790770685a77b1b43c7dadbea55396e983c465
Parents: b4ca1eb
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Mon Feb 8 11:45:01 2016 -0500
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Mon Feb 8 11:45:01 2016 -0500

----------------------------------------------------------------------
 .../server/handler/AiravataServerHandler.java   |    8 +-
 .../java/org/apache/airavata/api/Airavata.java  |  724 +++++++----
 .../main/resources/lib/airavata/Airavata.cpp    |   24 +-
 .../src/main/resources/lib/airavata/Airavata.h  |  691 ++++++++---
 .../lib/airavata/Airavata_server.skeleton.cpp   |  628 +++++++---
 .../lib/airavata/workflow_data_model_types.cpp  |  966 ++++++++++++++-
 .../lib/airavata/workflow_data_model_types.h    |  444 ++++++-
 .../resources/lib/Airavata/API/Airavata.php     |  614 ++++++---
 .../main/resources/lib/Airavata/Model/Types.php |  885 ++++++++++++-
 .../lib/apache/airavata/api/Airavata-remote     |    6 +-
 .../lib/apache/airavata/api/Airavata.py         | 1168 +++++++++++++-----
 .../apache/airavata/model/workflow/ttypes.py    |  671 +++++++++-
 .../apache/airavata/model/ComponentStatus.java  |    2 +-
 .../org/apache/airavata/model/EdgeModel.java    |    2 +-
 .../org/apache/airavata/model/NodeModel.java    |    2 +-
 .../org/apache/airavata/model/PortModel.java    |    2 +-
 .../org/apache/airavata/model/Workflow.java     | 1055 ----------------
 .../apache/airavata/model/WorkflowModel.java    |  339 ++++-
 .../apache/airavata/model/WorkflowStatus.java   |    2 +-
 .../ApplicationDeploymentDescription.java       |    2 +-
 .../appdeployment/ApplicationModule.java        |    2 +-
 .../appcatalog/appdeployment/CommandObject.java |    2 +-
 .../appcatalog/appdeployment/SetEnvPaths.java   |    2 +-
 .../ApplicationInterfaceDescription.java        |    2 +-
 .../appcatalog/computeresource/BatchQueue.java  |    2 +-
 .../computeresource/CloudJobSubmission.java     |    2 +-
 .../ComputeResourceDescription.java             |    2 +-
 .../computeresource/GlobusJobSubmission.java    |    2 +-
 .../computeresource/JobSubmissionInterface.java |    2 +-
 .../computeresource/LOCALSubmission.java        |    2 +-
 .../computeresource/ResourceJobManager.java     |    2 +-
 .../computeresource/SSHJobSubmission.java       |    2 +-
 .../computeresource/UnicoreJobSubmission.java   |    2 +-
 .../ComputeResourcePreference.java              |    2 +-
 .../gatewayprofile/GatewayResourceProfile.java  |    2 +-
 .../gatewayprofile/StoragePreference.java       |    2 +-
 .../StorageResourceDescription.java             |    2 +-
 .../application/io/InputDataObjectType.java     |    2 +-
 .../application/io/OutputDataObjectType.java    |    2 +-
 .../airavata/model/commons/ErrorModel.java      |    2 +-
 .../model/commons/ValidationResults.java        |    2 +-
 .../airavata/model/commons/ValidatorResult.java |    2 +-
 .../data/movement/DataMovementInterface.java    |    2 +-
 .../data/movement/GridFTPDataMovement.java      |    2 +-
 .../model/data/movement/LOCALDataMovement.java  |    2 +-
 .../model/data/movement/SCPDataMovement.java    |    2 +-
 .../data/movement/UnicoreDataMovement.java      |    2 +-
 .../data/resource/DataReplicaLocationModel.java |    2 +-
 .../model/data/resource/DataResourceModel.java  |    2 +-
 .../model/error/AiravataClientException.java    |    2 +-
 .../model/error/AiravataSystemException.java    |    2 +-
 .../model/error/AuthenticationException.java    |    2 +-
 .../model/error/AuthorizationException.java     |    2 +-
 .../error/ExperimentNotFoundException.java      |    2 +-
 .../model/error/InvalidRequestException.java    |    2 +-
 .../model/error/LaunchValidationException.java  |    2 +-
 .../model/error/ProjectNotFoundException.java   |    2 +-
 .../airavata/model/error/TimedOutException.java |    2 +-
 .../airavata/model/error/ValidationResults.java |    2 +-
 .../airavata/model/error/ValidatorResult.java   |    2 +-
 .../model/experiment/ExperimentModel.java       |    2 +-
 .../model/experiment/ExperimentStatistics.java  |    2 +-
 .../experiment/ExperimentSummaryModel.java      |    2 +-
 .../experiment/UserConfigurationDataModel.java  |    2 +-
 .../org/apache/airavata/model/job/JobModel.java |    2 +-
 .../event/ExperimentStatusChangeEvent.java      |    2 +-
 .../model/messaging/event/JobIdentifier.java    |    2 +-
 .../messaging/event/JobStatusChangeEvent.java   |    2 +-
 .../event/JobStatusChangeRequestEvent.java      |    2 +-
 .../airavata/model/messaging/event/Message.java |    2 +-
 .../messaging/event/ProcessIdentifier.java      |    2 +-
 .../event/ProcessStatusChangeEvent.java         |    2 +-
 .../event/ProcessStatusChangeRequestEvent.java  |    2 +-
 .../messaging/event/ProcessSubmitEvent.java     |    2 +-
 .../messaging/event/ProcessTerminateEvent.java  |    2 +-
 .../model/messaging/event/TaskIdentifier.java   |    2 +-
 .../messaging/event/TaskOutputChangeEvent.java  |    2 +-
 .../messaging/event/TaskStatusChangeEvent.java  |    2 +-
 .../event/TaskStatusChangeRequestEvent.java     |    2 +-
 .../airavata/model/process/ProcessModel.java    |    2 +-
 .../ComputationalResourceSchedulingModel.java   |    2 +-
 .../airavata/model/security/AuthzToken.java     |    2 +-
 .../airavata/model/status/ExperimentStatus.java |    2 +-
 .../apache/airavata/model/status/JobStatus.java |    2 +-
 .../airavata/model/status/ProcessStatus.java    |    2 +-
 .../airavata/model/status/TaskStatus.java       |    2 +-
 .../model/task/DataStagingTaskModel.java        |    2 +-
 .../model/task/EnvironmentSetupTaskModel.java   |    2 +-
 .../model/task/JobSubmissionTaskModel.java      |    2 +-
 .../airavata/model/task/MonitorTaskModel.java   |    2 +-
 .../apache/airavata/model/task/TaskModel.java   |    2 +-
 .../airavata/model/workspace/Gateway.java       |    2 +-
 .../apache/airavata/model/workspace/Group.java  |    2 +-
 .../airavata/model/workspace/Project.java       |    2 +-
 .../apache/airavata/model/workspace/User.java   |    2 +-
 .../catalog/impl/WorkflowCatalogImpl.java       |    8 +-
 .../utils/WorkflowCatalogThriftConversion.java  |    6 +-
 .../airavata/registry/cpi/WorkflowCatalog.java  |    7 +-
 .../airavata-apis/airavata_api.thrift           |    6 +-
 99 files changed, 6116 insertions(+), 2296 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/4c790770/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
index 8bf0ee1..03b4e11 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
@@ -38,7 +38,7 @@ import org.apache.airavata.data.manager.cpi.DataManagerException;
 import org.apache.airavata.messaging.core.MessageContext;
 import org.apache.airavata.messaging.core.Publisher;
 import org.apache.airavata.messaging.core.PublisherFactory;
-import org.apache.airavata.model.Workflow;
+import org.apache.airavata.model.WorkflowModel;
 import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription;
 import org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule;
 import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription;
@@ -4159,7 +4159,7 @@ public class AiravataServerHandler implements Airavata.Iface {
 
 	@Override
     @SecurityCheck
-	public Workflow getWorkflow(AuthzToken authzToken, String workflowTemplateId)
+	public WorkflowModel getWorkflow(AuthzToken authzToken, String workflowTemplateId)
 			throws InvalidRequestException, AiravataClientException, AuthorizationException, AiravataSystemException, TException {
 		try {
 			return getWorkflowCatalog().getWorkflow(workflowTemplateId);
@@ -4189,7 +4189,7 @@ public class AiravataServerHandler implements Airavata.Iface {
 
 	@Override
     @SecurityCheck
-	public String registerWorkflow(AuthzToken authzToken, String gatewayId, Workflow workflow)
+	public String registerWorkflow(AuthzToken authzToken, String gatewayId, WorkflowModel workflow)
 			throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
         if (!isGatewayExistInternal(gatewayId)){
             logger.error("Gateway does not exist.Please provide a valid gateway id...");
@@ -4208,7 +4208,7 @@ public class AiravataServerHandler implements Airavata.Iface {
 
 	@Override
     @SecurityCheck
-	public void updateWorkflow(AuthzToken authzToken, String workflowTemplateId, Workflow workflow)
+	public void updateWorkflow(AuthzToken authzToken, String workflowTemplateId, WorkflowModel workflow)
 			throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
 		try {
 			getWorkflowCatalog().updateWorkflow(workflowTemplateId, workflow);