Updated Branches: refs/heads/master e7ab72102 -> 37a21a83a
updating get function implementation - AIRAVATA-1006 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/37a21a83 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/37a21a83 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/37a21a83 Branch: refs/heads/master Commit: 37a21a83a94d53239b74022e38b2881990ad4a17 Parents: e7ab721 Author: chathuri <[email protected]> Authored: Mon Feb 10 10:17:06 2014 -0500 Committer: chathuri <[email protected]> Committed: Mon Feb 10 10:17:06 2014 -0500 ---------------------------------------------------------------------- .../persistance/registry/jpa/impl/ExperimentRegistry.java | 9 ++++++++- .../persistance/registry/jpa/impl/RegistryImpl.java | 2 +- .../registry/jpa/utils/ThriftDataModelConversion.java | 6 ++++-- 3 files changed, 13 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/37a21a83/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java index f5ac5db..a31f449 100644 --- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java +++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java @@ -385,9 +385,16 @@ public class ExperimentRegistry { } public Object getBasicMetaDataValues(String expId, String fieldName) { - if (fieldName.equals(Constants.FieldConstants.BasicMetadataConstants.USER_NAME)){ + try { + gatewayRegistry = new GatewayRegistry(); + GatewayResource gateway = gatewayRegistry.getGateway(); + if (fieldName.equals(Constants.FieldConstants.BasicMetadataConstants.USER_NAME)){ + } + } catch (ApplicationSettingsException e) { + logger.error("Unable to read airavata-server properties", e.getMessage()); } + return null; } http://git-wip-us.apache.org/repos/asf/airavata/blob/37a21a83/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/RegistryImpl.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/RegistryImpl.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/RegistryImpl.java index ba9f8f4..e2e95ed 100644 --- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/RegistryImpl.java +++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/RegistryImpl.java @@ -100,7 +100,6 @@ public class RegistryImpl implements Registry { } } - @Override /** * This method is to retrieve list of objects according to a given criteria * @param dataType Data type is a predefined type which the programmer should choose according to the object he @@ -110,6 +109,7 @@ public class RegistryImpl implements Registry { * @param value value for the filtering field. In the experiment case, value for "userName" can be "admin" * @return List of objects according to the given criteria */ + @Override public List<Object> get(DataType dataType, String fieldName, Object value) { List<Object> result = new ArrayList<Object>(); switch (dataType){ http://git-wip-us.apache.org/repos/asf/airavata/blob/37a21a83/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 c46099d..a02f61c 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 @@ -54,8 +54,10 @@ public class ThriftDataModelConversion { configData.setWorkflowTemplateId(excd.getWorkflowTemplateId()); configData.setWorklfowTemplateVersion(excd.getWorkflowTemplateVersion()); configData.setExperimentInputs(getExperimentInputs(excd.getExMetadata())); - - + configData.setAdvanceInputDataHandling(getAdvanceInputDataHandling(excd)); + configData.setAdvanceOutputDataHandling(getAdvanceOutputDataHandling(excd)); + configData.setComputationalResourceScheduling(getComputationalResourceScheduling(excd)); + configData.setQosParams(getQOSParams(excd)); return configData; }
