Repository: airavata Updated Branches: refs/heads/master 0a90a404c -> 4ee4b1a1e
compilation issue in AiravataServerHandler Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/4ee4b1a1 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/4ee4b1a1 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/4ee4b1a1 Branch: refs/heads/master Commit: 4ee4b1a1ec726499d012b89ad76c4ffca3164e84 Parents: 0a90a40 Author: Chathuri Wimalasena <[email protected]> Authored: Mon Jun 22 11:35:56 2015 -0400 Committer: Chathuri Wimalasena <[email protected]> Committed: Mon Jun 22 11:35:56 2015 -0400 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 28 ++++++++++---------- modules/gfac/pom.xml | 2 +- .../airavata/registry/cpi/utils/Constants.java | 1 + 3 files changed, 16 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/4ee4b1a1/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 eab0ada..ad3d239 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 @@ -652,7 +652,7 @@ public class AiravataServerHandler implements Airavata.Iface { experimentCatalog = RegistryFactory.getExperimentCatalog(gatewayId); Map<String, String> filters = new HashMap<String, String>(); filters.put(Constants.FieldConstants.ExperimentConstants.USER_NAME, userName); - filters.put(Constants.FieldConstants.ExperimentConstants.GATEWAY, gatewayId); + filters.put(Constants.FieldConstants.ExperimentConstants.GATEWAY_ID, gatewayId); filters.put(Constants.FieldConstants.ExperimentConstants.EXPERIMENT_NAME, expName); List<Object> results = experimentCatalog.search(ExperimentCatalogModelType.EXPERIMENT, filters, limit, offset, Constants.FieldConstants.ExperimentConstants.CREATION_TIME, ResultOrderType.DESC); @@ -730,8 +730,8 @@ public class AiravataServerHandler implements Airavata.Iface { experimentCatalog = RegistryFactory.getExperimentCatalog(gatewayId); Map<String, String> filters = new HashMap<String, String>(); filters.put(Constants.FieldConstants.ExperimentConstants.USER_NAME, userName); - filters.put(Constants.FieldConstants.ExperimentConstants.GATEWAY, gatewayId); - filters.put(Constants.FieldConstants.ExperimentConstants.EXPERIMENT_DESC, description); + filters.put(Constants.FieldConstants.ExperimentConstants.GATEWAY_ID, gatewayId); + filters.put(Constants.FieldConstants.ExperimentConstants.DESCRIPTION, description); List<Object> results = experimentCatalog.search(ExperimentCatalogModelType.EXPERIMENT, filters, limit, offset, Constants.FieldConstants.ExperimentConstants.CREATION_TIME, ResultOrderType.DESC); for (Object object : results) { @@ -805,8 +805,8 @@ public class AiravataServerHandler implements Airavata.Iface { experimentCatalog = RegistryFactory.getExperimentCatalog(gatewayId); Map<String, String> filters = new HashMap<String, String>(); filters.put(Constants.FieldConstants.ExperimentConstants.USER_NAME, userName); - filters.put(Constants.FieldConstants.ExperimentConstants.APPLICATION_ID, applicationId); - filters.put(Constants.FieldConstants.ExperimentConstants.GATEWAY, gatewayId); + filters.put(Constants.FieldConstants.ExperimentConstants.EXECUTION_ID, applicationId); + filters.put(Constants.FieldConstants.ExperimentConstants.GATEWAY_ID, gatewayId); List<Object> results = experimentCatalog.search(ExperimentCatalogModelType.EXPERIMENT, filters, limit, offset, Constants.FieldConstants.ExperimentConstants.CREATION_TIME, ResultOrderType.DESC); for (Object object : results) { @@ -881,7 +881,7 @@ public class AiravataServerHandler implements Airavata.Iface { Map<String, String> filters = new HashMap<String, String>(); filters.put(Constants.FieldConstants.ExperimentConstants.USER_NAME, userName); filters.put(Constants.FieldConstants.ExperimentConstants.EXPERIMENT_STATUS, experimentState.toString()); - filters.put(Constants.FieldConstants.ExperimentConstants.GATEWAY, gatewayId); + filters.put(Constants.FieldConstants.ExperimentConstants.GATEWAY_ID, gatewayId); List<Object> results = experimentCatalog.search(ExperimentCatalogModelType.EXPERIMENT, filters, limit, offset, Constants.FieldConstants.ExperimentConstants.CREATION_TIME, ResultOrderType.DESC); for (Object object : results) { @@ -961,7 +961,7 @@ public class AiravataServerHandler implements Airavata.Iface { filters.put(Constants.FieldConstants.ExperimentConstants.USER_NAME, userName); filters.put(Constants.FieldConstants.ExperimentConstants.FROM_DATE, String.valueOf(fromTime)); filters.put(Constants.FieldConstants.ExperimentConstants.TO_DATE, String.valueOf(toTime)); - filters.put(Constants.FieldConstants.ExperimentConstants.GATEWAY, gatewayId); + filters.put(Constants.FieldConstants.ExperimentConstants.GATEWAY_ID, gatewayId); List<Object> results = experimentCatalog.search(ExperimentCatalogModelType.EXPERIMENT, filters, limit, offset, Constants.FieldConstants.ExperimentConstants.CREATION_TIME, ResultOrderType.DESC); for (Object object : results) { @@ -1018,15 +1018,15 @@ public class AiravataServerHandler implements Airavata.Iface { experimentCatalog = RegistryFactory.getExperimentCatalog(gatewayId); Map<String, String> regFilters = new HashMap(); regFilters.put(Constants.FieldConstants.ExperimentConstants.USER_NAME, userName); - regFilters.put(Constants.FieldConstants.ExperimentConstants.GATEWAY, gatewayId); + regFilters.put(Constants.FieldConstants.ExperimentConstants.GATEWAY_ID, gatewayId); for(Map.Entry<ExperimentSearchFields, String> entry : filters.entrySet()) { if(entry.getKey().equals(ExperimentSearchFields.EXPERIMENT_NAME)){ regFilters.put(Constants.FieldConstants.ExperimentConstants.EXPERIMENT_NAME, entry.getValue()); }else if(entry.getKey().equals(ExperimentSearchFields.EXPERIMENT_DESC)){ - regFilters.put(Constants.FieldConstants.ExperimentConstants.EXPERIMENT_DESC, entry.getValue()); + regFilters.put(Constants.FieldConstants.ExperimentConstants.DESCRIPTION, entry.getValue()); }else if(entry.getKey().equals(ExperimentSearchFields.APPLICATION_ID)){ - regFilters.put(Constants.FieldConstants.ExperimentConstants.APPLICATION_ID, entry.getValue()); + regFilters.put(Constants.FieldConstants.ExperimentConstants.EXECUTION_ID, entry.getValue()); }else if(entry.getKey().equals(ExperimentSearchFields.STATUS)){ regFilters.put(Constants.FieldConstants.ExperimentConstants.EXPERIMENT_STATUS, entry.getValue()); }else if(entry.getKey().equals(ExperimentSearchFields.FROM_DATE)){ @@ -1071,7 +1071,7 @@ public class AiravataServerHandler implements Airavata.Iface { } try { Map<String, String> filters = new HashMap(); - filters.put(Constants.FieldConstants.ExperimentConstants.GATEWAY, gatewayId); + filters.put(Constants.FieldConstants.ExperimentConstants.GATEWAY_ID, gatewayId); filters.put(Constants.FieldConstants.ExperimentConstants.FROM_DATE, fromTime+""); filters.put(Constants.FieldConstants.ExperimentConstants.TO_DATE, toTime+""); @@ -1394,7 +1394,7 @@ public class AiravataServerHandler implements Airavata.Iface { ExperimentState experimentState = experimentStatus.getState(); switch (experimentState){ case CREATED: case VALIDATED: case CANCELED: case FAILED: - experimentCatalog.add(ExpCatChildDataType.EXPERIMENT_CONFIGURATION_DATA, userConfiguration, airavataExperimentId); + experimentCatalog.add(ExpCatChildDataType.USER_CONFIGURATION_DATA, userConfiguration, airavataExperimentId); logger.info(airavataExperimentId, "Successfully updated experiment configuration for experiment {}.", airavataExperimentId); break; default: @@ -1434,7 +1434,7 @@ public class AiravataServerHandler implements Airavata.Iface { ExperimentState experimentState = experimentStatus.getState(); switch (experimentState){ case CREATED: case VALIDATED: case CANCELED: case FAILED: - experimentCatalog.add(ExpCatChildDataType.COMPUTATIONAL_RESOURCE_SCHEDULING, resourceScheduling, airavataExperimentId); + experimentCatalog.add(ExpCatChildDataType.PROCESS_RESOURCE_SCHEDULE, resourceScheduling, airavataExperimentId); logger.info(airavataExperimentId, "Successfully updated resource scheduling for the experiment {}.", airavataExperimentId); break; default: @@ -1772,7 +1772,7 @@ public class AiravataServerHandler implements Airavata.Iface { throw new ExperimentNotFoundException("Requested experiment id " + existingExperimentID + " does not exist in the system.."); } ExperimentModel existingExperiment = (ExperimentModel) experimentCatalog.get(ExperimentCatalogModelType.EXPERIMENT, existingExperimentID); - String gatewayId = (String) experimentCatalog.getValue(ExperimentCatalogModelType.EXPERIMENT, existingExperimentID, Constants.FieldConstants.ExperimentConstants.GATEWAY); + String gatewayId = (String) experimentCatalog.getValue(ExperimentCatalogModelType.EXPERIMENT, existingExperimentID, Constants.FieldConstants.ExperimentConstants.GATEWAY_ID); existingExperiment.setCreationTime(AiravataUtils.getCurrentTimestamp().getTime()); if (existingExperiment.getExecutionId() != null){ List<OutputDataObjectType> applicationOutputs = getApplicationOutputs(existingExperiment.getExecutionId()); http://git-wip-us.apache.org/repos/asf/airavata/blob/4ee4b1a1/modules/gfac/pom.xml ---------------------------------------------------------------------- diff --git a/modules/gfac/pom.xml b/modules/gfac/pom.xml index 3bb21a9..93e5d51 100644 --- a/modules/gfac/pom.xml +++ b/modules/gfac/pom.xml @@ -35,7 +35,7 @@ <module>gfac-client</module> <module>gfac-core</module> <module>gfac-impl</module> - <module>gfac-bes</module> + <!--<module>gfac-bes</module>--> <module>gfac-application-specific-handlers</module> </modules> </profile> http://git-wip-us.apache.org/repos/asf/airavata/blob/4ee4b1a1/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/utils/Constants.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/utils/Constants.java b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/utils/Constants.java index 33d3c73..e466f21 100644 --- a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/utils/Constants.java +++ b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/utils/Constants.java @@ -35,6 +35,7 @@ public class Constants { public final class ExperimentConstants { public static final String EXPERIMENT_ID = "experimentId"; public static final String PROJECT_ID = "projectId"; + public static final String GATEWAY_ID = "gatewayId"; public static final String EXPERIMENT_TYPE = "experimentType"; public static final String USER_NAME = "userName"; public static final String EXPERIMENT_NAME = "experimentName";
