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 2014/05/15 17:18:27 UTC
[1/2] git commit: fixing some possible places where state can be set
as empty
Repository: airavata
Updated Branches:
refs/heads/master c1a1bad59 -> 84294a7b9
fixing some possible places where state can be set as empty
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/da941018
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/da941018
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/da941018
Branch: refs/heads/master
Commit: da941018b6752e44b4bef4789d0b8bfa5470150c
Parents: 8790244
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Thu May 15 11:17:14 2014 -0400
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Thu May 15 11:17:14 2014 -0400
----------------------------------------------------------------------
.../resources/DataTransferDetailResource.java | 3 +
.../jpa/resources/ExperimentResource.java | 6 ++
.../jpa/resources/JobDetailResource.java | 6 ++
.../jpa/resources/TaskDetailResource.java | 3 +
.../resources/WorkflowNodeDetailResource.java | 6 ++
.../jpa/utils/ThriftDataModelConversion.java | 107 +++++++++++--------
6 files changed, 89 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/da941018/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/DataTransferDetailResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/DataTransferDetailResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/DataTransferDetailResource.java
index 501954d..bd2a5c0 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/DataTransferDetailResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/DataTransferDetailResource.java
@@ -207,6 +207,9 @@ public class DataTransferDetailResource extends AbstractResource {
for (Resource resource : resources) {
StatusResource dataTransferStatus = (StatusResource) resource;
if(dataTransferStatus.getStatusType().equals(StatusType.DATA_TRANSFER.toString())){
+ if (dataTransferStatus.getState() == null || dataTransferStatus.getState().equals("") ){
+ dataTransferStatus.setState("UNKNOWN");
+ }
return dataTransferStatus;
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/da941018/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentResource.java
index f44ab67..ddfa256 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentResource.java
@@ -582,6 +582,9 @@ public class ExperimentResource extends AbstractResource {
for (Resource resource : resources) {
StatusResource expStatus = (StatusResource) resource;
if(expStatus.getStatusType().equals(StatusType.EXPERIMENT.toString())){
+ if (expStatus.getState() == null || expStatus.getState().equals("") ){
+ expStatus.setState("UNKNOWN");
+ }
return expStatus;
}
}
@@ -594,6 +597,9 @@ public class ExperimentResource extends AbstractResource {
for (Resource resource : resources) {
StatusResource workflowNodeStatus = (StatusResource) resource;
if(workflowNodeStatus.getStatusType().equals(StatusType.WORKFLOW_NODE.toString())){
+ if (workflowNodeStatus.getState() == null || workflowNodeStatus.getState().equals("")){
+ workflowNodeStatus.setState("UNKNOWN");
+ }
statuses.add(workflowNodeStatus);
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/da941018/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/JobDetailResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/JobDetailResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/JobDetailResource.java
index f66ff84..aebdf15 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/JobDetailResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/JobDetailResource.java
@@ -249,6 +249,9 @@ public class JobDetailResource extends AbstractResource {
for (Resource resource : resources) {
StatusResource jobStatus = (StatusResource) resource;
if(jobStatus.getStatusType().equals(StatusType.JOB.toString())){
+ if (jobStatus.getState() == null || jobStatus.getState().equals("") ){
+ jobStatus.setState("UNKNOWN");
+ }
return jobStatus;
}
}
@@ -260,6 +263,9 @@ public class JobDetailResource extends AbstractResource {
for (Resource resource : resources) {
StatusResource appStatus = (StatusResource) resource;
if(appStatus.getStatusType().equals(StatusType.APPLICATION.toString())){
+ if (appStatus.getState() == null || appStatus.getState().equals("") ){
+ appStatus.setState("UNKNOWN");
+ }
return appStatus;
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/da941018/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/TaskDetailResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/TaskDetailResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/TaskDetailResource.java
index 52b17ed..1dcec6d 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/TaskDetailResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/TaskDetailResource.java
@@ -476,6 +476,9 @@ public class TaskDetailResource extends AbstractResource {
for (Resource resource : resources) {
StatusResource taskStatus = (StatusResource) resource;
if(taskStatus.getStatusType().equals(StatusType.TASK.toString())){
+ if (taskStatus.getState() == null || taskStatus.getState().equals("") ){
+ taskStatus.setState("UNKNOWN");
+ }
return taskStatus;
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/da941018/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkflowNodeDetailResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkflowNodeDetailResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkflowNodeDetailResource.java
index 19a1d78..05d8671 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkflowNodeDetailResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkflowNodeDetailResource.java
@@ -352,6 +352,9 @@ public class WorkflowNodeDetailResource extends AbstractResource {
for (Resource resource : resources) {
StatusResource nodeStatus = (StatusResource) resource;
if(nodeStatus.getStatusType().equals(StatusType.WORKFLOW_NODE.toString())){
+ if (nodeStatus.getState() == null || nodeStatus.getState().equals("") ){
+ nodeStatus.setState("UNKNOWN");
+ }
return nodeStatus;
}
}
@@ -363,6 +366,9 @@ public class WorkflowNodeDetailResource extends AbstractResource {
for (Resource resource : resources) {
StatusResource taskStatus = (StatusResource) resource;
if(taskStatus.getStatusType().equals(StatusType.TASK.toString()) && taskStatus.getTaskDetailResource().getTaskId().equals(taskId)){
+ if (taskStatus.getState() == null || taskStatus.getState().equals("") ){
+ taskStatus.setState("UNKNOWN");
+ }
return taskStatus;
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/da941018/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java
index 7ee89c3..8a5ec2f 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java
@@ -35,8 +35,8 @@ public class ThriftDataModelConversion {
private final static Logger logger = LoggerFactory.getLogger(ThriftDataModelConversion.class);
public static Project getProject (ProjectResource pr){
- Project project = new Project();
if (pr != null) {
+ Project project = new Project();
project.setProjectID(pr.getId());
project.setName(pr.getName());
if (pr.getCreationTime()!=null) {
@@ -52,14 +52,15 @@ public class ThriftDataModelConversion {
}
}
project.setSharedGroups(sharedUsers);
+ return project;
}
- return project;
+ return null;
}
public static Experiment getExperiment(ExperimentResource experimentResource){
- Experiment experiment = new Experiment();
if (experimentResource != null){
+ Experiment experiment = new Experiment();
if (experimentResource.getProject()!= null){
experiment.setProjectID(experimentResource.getProject().getId());
}
@@ -99,14 +100,14 @@ public class ThriftDataModelConversion {
ConfigDataResource userConfigData = experimentResource.getUserConfigData(expID);
experiment.setUserConfigurationData(getUserConfigData(userConfigData));
}
+ return experiment;
}
-
- return experiment;
+ return null;
}
public static DataObjectType getInputOutput(Object object){
- DataObjectType dataObjectType = new DataObjectType();
if (object != null){
+ DataObjectType dataObjectType = new DataObjectType();
if (object instanceof ExperimentInputResource){
ExperimentInputResource expInput = (ExperimentInputResource) object;
dataObjectType.setKey(expInput.getExperimentKey());
@@ -150,10 +151,10 @@ public class ThriftDataModelConversion {
dataObjectType.setMetaData(outputResource.getMetadata());
return dataObjectType;
}else {
- return dataObjectType;
+ return null;
}
}
- return dataObjectType;
+ return null;
}
public static List<DataObjectType> getExpInputs (List<ExperimentInputResource> exInputList){
@@ -164,7 +165,6 @@ public class ThriftDataModelConversion {
expInputs.add(exInput);
}
}
-
return expInputs;
}
@@ -209,7 +209,6 @@ public class ThriftDataModelConversion {
appInputs.add(appInput);
}
}
-
return appInputs;
}
@@ -221,41 +220,54 @@ public class ThriftDataModelConversion {
appOutputs.add(output);
}
}
-
return appOutputs;
}
public static ExperimentStatus getExperimentStatus(StatusResource status){
- ExperimentStatus experimentStatus = new ExperimentStatus();
if (status != null){
+ ExperimentStatus experimentStatus = new ExperimentStatus();
+ if (status.getState() == null || status.getState().equals("")){
+ status.setState("UNKNOWN");
+ }
experimentStatus.setExperimentState(ExperimentState.valueOf(status.getState()));
experimentStatus.setTimeOfStateChange(status.getStatusUpdateTime().getTime());
return experimentStatus;
}
- return experimentStatus;
+ return null;
}
public static WorkflowNodeStatus getWorkflowNodeStatus (StatusResource status){
- WorkflowNodeStatus workflowNodeStatus = new WorkflowNodeStatus();
if (status != null){
+ WorkflowNodeStatus workflowNodeStatus = new WorkflowNodeStatus();
+ if (status.getState() == null || status.getState().equals("")){
+ status.setState("UNKNOWN");
+ }
workflowNodeStatus.setWorkflowNodeState(WorkflowNodeState.valueOf(status.getState()));
workflowNodeStatus.setTimeOfStateChange(status.getStatusUpdateTime().getTime());
+ return workflowNodeStatus;
}
- return workflowNodeStatus;
+ return null;
}
public static TaskStatus getTaskStatus (StatusResource status){
- TaskStatus taskStatus = new TaskStatus();
if (status != null){
+ TaskStatus taskStatus = new TaskStatus();
+ if (status.getState() == null || status.getState().equals("")){
+ status.setState("UNKNOWN");
+ }
taskStatus.setExecutionState(TaskState.valueOf(status.getState()));
taskStatus.setTimeOfStateChange(status.getStatusUpdateTime().getTime());
+ return taskStatus;
}
- return taskStatus;
+ return null;
}
public static JobStatus getJobStatus (StatusResource status){
if (status != null){
JobStatus jobStatus = new JobStatus();
+ if (status.getState() == null || status.getState().equals("")){
+ status.setState("UNKNOWN");
+ }
jobStatus.setJobState(JobState.valueOf(status.getState()));
jobStatus.setTimeOfStateChange(status.getStatusUpdateTime().getTime());
return jobStatus;
@@ -266,6 +278,9 @@ public class ThriftDataModelConversion {
public static TransferStatus getTransferStatus (StatusResource status){
if (status != null){
TransferStatus transferStatus = new TransferStatus();
+ if (status.getState() == null || status.getState().equals("")){
+ status.setState("UNKNOWN");
+ }
transferStatus.setTransferState(TransferState.valueOf(status.getState()));
transferStatus.setTimeOfStateChange(status.getStatusUpdateTime().getTime());
return transferStatus;
@@ -276,6 +291,9 @@ public class ThriftDataModelConversion {
public static ApplicationStatus getApplicationStatus (StatusResource status){
if (status != null){
ApplicationStatus applicationStatus = new ApplicationStatus();
+ if (status.getState() == null || status.getState().equals("")){
+ status.setState("UNKNOWN");
+ }
applicationStatus.setApplicationState(status.getState());
applicationStatus.setTimeOfStateChange(status.getStatusUpdateTime().getTime());
return applicationStatus;
@@ -294,8 +312,8 @@ public class ThriftDataModelConversion {
}
public static WorkflowNodeDetails getWorkflowNodeDetails(WorkflowNodeDetailResource nodeDetailResource){
- WorkflowNodeDetails wfNode = new WorkflowNodeDetails();
if (nodeDetailResource != null){
+ WorkflowNodeDetails wfNode = new WorkflowNodeDetails();
wfNode.setNodeInstanceId(nodeDetailResource.getNodeInstanceId());
wfNode.setCreationTime(nodeDetailResource.getCreationTime().getTime());
wfNode.setNodeName(nodeDetailResource.getNodeName());
@@ -308,8 +326,9 @@ public class ThriftDataModelConversion {
wfNode.setWorkflowNodeStatus(getWorkflowNodeStatus(nodeDetailResource.getWorkflowNodeStatus()));
List<ErrorDetailResource> errorDetails = nodeDetailResource.getErrorDetails();
wfNode.setErrors(getErrorDetailList(errorDetails));
+ return wfNode;
}
- return wfNode;
+ return null;
}
public static List<WorkflowNodeDetails> getWfNodeList (List<WorkflowNodeDetailResource> resources){
@@ -323,8 +342,8 @@ public class ThriftDataModelConversion {
}
public static TaskDetails getTaskDetail (TaskDetailResource taskDetailResource){
- TaskDetails taskDetails = new TaskDetails();
if (taskDetailResource != null){
+ TaskDetails taskDetails = new TaskDetails();
String taskId = taskDetailResource.getTaskId();
taskDetails.setTaskID(taskId);
taskDetails.setApplicationId(taskDetailResource.getApplicationId());
@@ -353,9 +372,9 @@ public class ThriftDataModelConversion {
taskDetails.setJobDetailsList(getJobDetailsList(jobDetailList));
taskDetails.setErrors(getErrorDetailList(taskDetailResource.getErrorDetailList()));
taskDetails.setDataTransferDetailsList(getDataTransferlList(taskDetailResource.getDataTransferDetailList()));
+ return taskDetails;
}
-
- return taskDetails;
+ return null;
}
public static List<TaskDetails> getTaskDetailsList (List<TaskDetailResource> resources){
@@ -365,7 +384,6 @@ public class ThriftDataModelConversion {
taskDetailsList.add(getTaskDetail(resource));
}
}
-
return taskDetailsList;
}
@@ -381,8 +399,8 @@ public class ThriftDataModelConversion {
public static JobDetails getJobDetail(JobDetailResource jobDetailResource){
- JobDetails jobDetails = new JobDetails();
if (jobDetailResource != null){
+ JobDetails jobDetails = new JobDetails();
jobDetails.setJobID(jobDetailResource.getJobId());
jobDetails.setJobDescription(jobDetailResource.getJobDescription());
jobDetails.setCreationTime(jobDetailResource.getCreationTime().getTime());
@@ -393,13 +411,14 @@ public class ThriftDataModelConversion {
List<ErrorDetailResource> errorDetails = jobDetailResource.getErrorDetails();
jobDetails.setErrors(getErrorDetailList(errorDetails));
jobDetails.setComputeResourceConsumed(jobDetailResource.getComputeResourceConsumed());
+ return jobDetails;
}
- return jobDetails;
+ return null;
}
public static ErrorDetails getErrorDetails (ErrorDetailResource resource){
- ErrorDetails errorDetails = new ErrorDetails();
if (resource != null){
+ ErrorDetails errorDetails = new ErrorDetails();
errorDetails.setErrorID(String.valueOf(resource.getErrorId()));
errorDetails.setCreationTime(resource.getCreationTime().getTime());
errorDetails.setActualErrorMessage(resource.getActualErrorMsg());
@@ -408,9 +427,9 @@ public class ThriftDataModelConversion {
errorDetails.setTransientOrPersistent(resource.isTransientPersistent());
errorDetails.setCorrectiveAction(CorrectiveAction.valueOf(resource.getCorrectiveAction()));
errorDetails.setActionableGroup(ActionableGroup.valueOf(resource.getActionableGroup()));
+ return errorDetails;
}
- return errorDetails;
-
+ return null;
}
public static List<ErrorDetails> getErrorDetailList (List<ErrorDetailResource> errorDetailResources){
@@ -424,14 +443,15 @@ public class ThriftDataModelConversion {
}
public static DataTransferDetails getDataTransferDetail (DataTransferDetailResource resource){
- DataTransferDetails details = new DataTransferDetails();
if (resource != null){
+ DataTransferDetails details = new DataTransferDetails();
details.setTransferID(resource.getTransferId());
details.setCreationTime(resource.getCreationTime().getTime());
details.setTransferDescription(resource.getTransferDescription());
details.setTransferStatus(getTransferStatus(resource.getDataTransferStatus()));
+ return details;
}
- return details;
+ return null;
}
public static List<DataTransferDetails> getDataTransferlList (List<DataTransferDetailResource> resources){
@@ -446,8 +466,8 @@ public class ThriftDataModelConversion {
public static UserConfigurationData getUserConfigData (ConfigDataResource resource){
- UserConfigurationData data = new UserConfigurationData();
if (resource != null){
+ UserConfigurationData data = new UserConfigurationData();
data.setAiravataAutoSchedule(resource.isAiravataAutoSchedule());
data.setOverrideManualScheduledParams(resource.isOverrideManualParams());
data.setShareExperimentPublicly(resource.isShareExp());
@@ -472,15 +492,15 @@ public class ThriftDataModelConversion {
QosParamResource qoSparams = experimentResource.getQOSparams(expID);
data.setQosParams(getQOSParams(qoSparams));
}
+ return data;
}
-
- return data;
+ return null;
}
public static ComputationalResourceScheduling getComputationalResourceScheduling (ComputationSchedulingResource csr){
- ComputationalResourceScheduling scheduling = new ComputationalResourceScheduling();
if (csr != null){
+ ComputationalResourceScheduling scheduling = new ComputationalResourceScheduling();
scheduling.setResourceHostId(csr.getResourceHostId());
scheduling.setTotalCPUCount(csr.getCpuCount());
scheduling.setNodeCount(csr.getNodeCount());
@@ -490,39 +510,42 @@ public class ThriftDataModelConversion {
scheduling.setJobStartTime((int)csr.getJobStartTime().getTime());
scheduling.setTotalPhysicalMemory(csr.getPhysicalMemory());
scheduling.setComputationalProjectAccount(csr.getProjectName());
+ return scheduling;
}
-
- return scheduling;
+ return null;
}
public static AdvancedInputDataHandling getAdvanceInputDataHandling(AdvanceInputDataHandlingResource adhr){
- AdvancedInputDataHandling adih = new AdvancedInputDataHandling();
if (adhr != null){
+ AdvancedInputDataHandling adih = new AdvancedInputDataHandling();
adih.setStageInputFilesToWorkingDir(adhr.isStageInputFiles());
adih.setParentWorkingDirectory(adhr.getWorkingDirParent());
adih.setUniqueWorkingDirectory(adhr.getWorkingDir());
adih.setCleanUpWorkingDirAfterJob(adhr.isCleanAfterJob());
+ return adih;
}
- return adih;
+ return null;
}
public static AdvancedOutputDataHandling getAdvanceOutputDataHandling(AdvancedOutputDataHandlingResource adodh){
- AdvancedOutputDataHandling outputDataHandling = new AdvancedOutputDataHandling();
if (adodh != null){
+ AdvancedOutputDataHandling outputDataHandling = new AdvancedOutputDataHandling();
outputDataHandling.setOutputDataDir(adodh.getOutputDataDir());
outputDataHandling.setDataRegistryURL(adodh.getDataRegUrl());
outputDataHandling.setPersistOutputData(adodh.isPersistOutputData());
+ return outputDataHandling;
}
- return outputDataHandling;
+ return null;
}
public static QualityOfServiceParams getQOSParams (QosParamResource qos){
- QualityOfServiceParams qosParams = new QualityOfServiceParams();
if (qos != null){
+ QualityOfServiceParams qosParams = new QualityOfServiceParams();
qosParams.setStartExecutionAt(qos.getStartExecutionAt());
qosParams.setExecuteBefore(qos.getExecuteBefore());
qosParams.setNumberofRetries(qos.getNoOfRetries());
+ return qosParams;
}
- return qosParams;
+ return null;
}
}
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by ch...@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/84294a7b
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/84294a7b
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/84294a7b
Branch: refs/heads/master
Commit: 84294a7b9e684d5990fb54de3b64c3f97ab4175b
Parents: da94101 c1a1bad
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Thu May 15 11:17:42 2014 -0400
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Thu May 15 11:17:42 2014 -0400
----------------------------------------------------------------------
.../api/appcatalog/ApplicationCatalogAPI.java | 4800 ++++++++++--
.../resources/lib/ApplicationCatalogAPI.cpp | 6973 ++++++++++++++++++
.../main/resources/lib/ApplicationCatalogAPI.h | 3040 ++++++++
.../ApplicationCatalogAPI_server.skeleton.cpp | 139 +
.../src/main/resources/lib/airavataAPI_types.h | 1 +
.../lib/applicationCatalogAPI_constants.cpp | 19 +
.../lib/applicationCatalogAPI_constants.h | 25 +
.../lib/applicationCatalogAPI_types.cpp | 13 +
.../resources/lib/applicationCatalogAPI_types.h | 25 +
.../applicationCatalogDataModel_constants.cpp | 19 +
.../lib/applicationCatalogDataModel_constants.h | 25 +
.../lib/applicationCatalogDataModel_types.cpp | 1260 ++++
.../lib/applicationCatalogDataModel_types.h | 730 ++
.../main/resources/lib/experimentModel_types.h | 1 +
.../API/AppCatalog/ApplicationCatalogAPI.php | 5387 ++++++++++++++
.../lib/Airavata/API/AppCatalog/Types.php | 22 +
.../src/main/resources/lib/Types.php | 1567 ++++
.../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 | 1163 +++
.../model/appcatalog/GlobusJobSubmission.java | 620 ++
.../model/appcatalog/JobSubmissionProtocol.java | 77 +
.../appcatalog/JobSubmissionProtocols.java | 937 +++
.../model/appcatalog/ResourceJobManager.java | 83 +
.../model/appcatalog/SCPDataMovement.java | 511 ++
.../model/appcatalog/SSHJobSubmission.java | 511 ++
.../model/appcatalog/SecurityProtocol.java | 82 +
.../applicationCatalogDataModelConstants.java | 55 +
.../airavataAPI.thrift | 1 +
.../applicationCatalogAPI.thrift | 59 +-
.../applicationCatalogDataModel.thrift | 2 +-
.../experimentModel.thrift | 2 +
35 files changed, 30803 insertions(+), 730 deletions(-)
----------------------------------------------------------------------