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/07/09 18:30:15 UTC
git commit: fixing issue with update app interface
Repository: airavata
Updated Branches:
refs/heads/master 7e2c4f03a -> 417a31093
fixing issue with update app interface
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/417a3109
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/417a3109
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/417a3109
Branch: refs/heads/master
Commit: 417a31093f9cf390dd84ca1d7ade71a780c2cc5f
Parents: 7e2c4f0
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Wed Jul 9 12:30:03 2014 -0400
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Wed Jul 9 12:30:03 2014 -0400
----------------------------------------------------------------------
.../client/samples/CreateLaunchExperiment.java | 16 ++++----
.../data/impl/ApplicationInterfaceImpl.java | 40 +++++++++++---------
2 files changed, 30 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/417a3109/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
index 31bd093..e7beab5 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
@@ -58,12 +58,12 @@ public class CreateLaunchExperiment {
private static final String DEFAULT_USER = "default.registry.user";
private static final String DEFAULT_GATEWAY = "default.registry.gateway";
private static Airavata.Client client;
- private static String localHostAppId="localhost_2342b39f-5870-4704-9a52-e631dc790af7,SimpleEcho0_17c5e56e-beda-42f2-a7ec-5c7654177bc3gw111.iu.xsede.org_d532e952-ca5e-494e-942f-526658bdc13f,DO_NOT_SET_AT_CLIENTS";
- private static String sshHostAppId;
- private static String pbsEchoAppId="trestles.sdsc.edu_7d2b65b3-5c96-4d3e-b505-4493ed1f543b,SimpleEcho2_af13af0d-6149-4135-825d-9e2fc9821874";
- private static String pbsWRFAppId="trestles.sdsc.edu_39b00c1f-074d-4980-8796-69ab70fa38e7,WRF_b7c9f782-233f-4fc5-932b-22023d115431";
- private static String slurmAppId="stampede.tacc.xsede.org_b2ef59cb-f626-4767-9ca0-601f94c42ba4,SimpleEcho3_b81c2559-a088-42a3-84ce-40119d874918";
- private static String sgeAppId;
+ private static String localHostAppId = "localhost_692ada33-d4fb-4cdf-861b-a9277d529a27,SimpleEcho0_212a7e71-2d32-4214-97f4-52dac6d07f5d";
+ private static String sshHostAppId = "SimpleEcho2_00e67736-75c7-43b6-844b-3c1c51527dfe";
+ private static String pbsEchoAppId="SimpleEcho2_00e67736-75c7-43b6-844b-3c1c51527dfe";
+ private static String pbsWRFAppId = "WRF_55462229-63f9-4ade-abda-00470ce38904";
+ private static String slurmAppId = "SimpleEcho3_5517fe0c-343f-4fb2-8c17-7e22a36b7785";
+ private static String sgeAppId = "SimpleEcho4_e4aa7814-f63f-4a2d-99ac-b8aebad55c57";
public static void main(String[] args) {
try {
AiravataUtils.setExecutionAsClient();
@@ -72,11 +72,11 @@ public class CreateLaunchExperiment {
// addDescriptors();
// final String expId = createExperimentForSSHHost(airavata);
-// final String expId = createExperimentForTrestles(client);
+ final String expId = createExperimentForTrestles(client);
// final String expId = createExperimentForStampede(client);
// final String expId = createExperimentForLocalHost(client);
// final String expId = createExperimentForLonestar(airavata);
- final String expId = createExperimentWRFTrestles(client);
+// final String expId = createExperimentWRFTrestles(client);
System.out.println("Experiment ID : " + expId);
// updateExperiment(airavata, expId);
launchExperiment(client, expId);
http://git-wip-us.apache.org/repos/asf/airavata/blob/417a3109/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationInterfaceImpl.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationInterfaceImpl.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationInterfaceImpl.java
index 89a8cbe..d578eac 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationInterfaceImpl.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationInterfaceImpl.java
@@ -180,17 +180,19 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
Map<String, String> ids = new HashMap<String, String>();
ids.put(AbstractResource.AppInputConstants.INTERFACE_ID, interfaceId);
ids.put(AbstractResource.AppInputConstants.INPUT_KEY, input.getName());
- ApplicationInputResource existingResource = (ApplicationInputResource)inputResource.get(ids);
- existingResource.setAppInterfaceResource(existingInterface);
- existingResource.setInterfaceID(interfaceId);
- existingResource.setUserFriendlyDesc(input.getUserFriendlyDescription());
- existingResource.setInputKey(input.getName());
- existingResource.setInputVal(input.getValue());
- existingResource.setDataType(input.getType().toString());
- existingResource.setMetadata(input.getMetaData());
- existingResource.setStandareInput(input.isStandardInput());
- existingResource.setAppArgument(input.getApplicationArgument());
- existingResource.save();
+ if (inputResource.isExists(ids)){
+ inputResource = (ApplicationInputResource)inputResource.get(ids);
+ }
+ inputResource.setAppInterfaceResource(existingInterface);
+ inputResource.setInterfaceID(interfaceId);
+ inputResource.setUserFriendlyDesc(input.getUserFriendlyDescription());
+ inputResource.setInputKey(input.getName());
+ inputResource.setInputVal(input.getValue());
+ inputResource.setDataType(input.getType().toString());
+ inputResource.setMetadata(input.getMetaData());
+ inputResource.setStandareInput(input.isStandardInput());
+ inputResource.setAppArgument(input.getApplicationArgument());
+ inputResource.save();
}
}
@@ -201,13 +203,15 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
Map<String, String> ids = new HashMap<String, String>();
ids.put(AbstractResource.AppOutputConstants.INTERFACE_ID, interfaceId);
ids.put(AbstractResource.AppOutputConstants.OUTPUT_KEY, output.getName());
- ApplicationOutputResource existingResource = (ApplicationOutputResource)outputResource.get(ids);
- existingResource.setInterfaceID(interfaceId);
- existingResource.setAppInterfaceResource(existingInterface);
- existingResource.setOutputKey(output.getName());
- existingResource.setOutputVal(output.getValue());
- existingResource.setDataType(output.getType().toString());
- existingResource.save();
+ if (outputResource.isExists(ids)){
+ outputResource = (ApplicationOutputResource)outputResource.get(ids);
+ }
+ outputResource.setInterfaceID(interfaceId);
+ outputResource.setAppInterfaceResource(existingInterface);
+ outputResource.setOutputKey(output.getName());
+ outputResource.setOutputVal(output.getValue());
+ outputResource.setDataType(output.getType().toString());
+ outputResource.save();
}
}
}catch (Exception e) {