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/11/05 20:39:23 UTC
git commit: fixing build issues in branch
Repository: airavata
Updated Branches:
refs/heads/gfac_appcatalog_int 755273e1a -> ce1354e96
fixing build issues in branch
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ce1354e9
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ce1354e9
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ce1354e9
Branch: refs/heads/gfac_appcatalog_int
Commit: ce1354e96d1f3d2eedc851ca87e00207ca9f56aa
Parents: 755273e
Author: chathuriw <ka...@gmail.com>
Authored: Wed Nov 5 14:39:05 2014 -0500
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Wed Nov 5 14:39:05 2014 -0500
----------------------------------------------------------------------
.../airavata/client/tools/RegisterSampleApplicationsUtils.java | 4 ++--
.../org/apache/airavata/client/tools/DocumentCreatorUtils.java | 4 ++--
.../apache/airavata/gfac/core/context/JobExecutionContext.java | 2 +-
modules/gfac/pom.xml | 6 +++---
.../airavata/integration/tools/DocumentCreatorUtils.java | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/ce1354e9/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplicationsUtils.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplicationsUtils.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplicationsUtils.java
index 57bcc27..24c0688 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplicationsUtils.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplicationsUtils.java
@@ -48,8 +48,8 @@ public class RegisterSampleApplicationsUtils {
computeResourcePreference.setOverridebyAiravata(overridebyAiravata);
computeResourcePreference.setAllocationProjectNumber(allocationProjectNumber);
computeResourcePreference.setPreferredBatchQueue(preferredBatchQueue);
- computeResourcePreference.setPreferredDataMovementProtocol(preferredDataMovementProtocol);
- computeResourcePreference.setPreferredJobSubmissionProtocol(preferredJobSubmissionProtocol);
+ computeResourcePreference.setPreferredDataMovementProtocol(DataMovementProtocol.valueOf(preferredDataMovementProtocol));
+ computeResourcePreference.setPreferredJobSubmissionProtocol(JobSubmissionProtocol.valueOf(preferredJobSubmissionProtocol));
computeResourcePreference.setScratchLocation(scratchLocation);
return computeResourcePreference;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/ce1354e9/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorUtils.java
----------------------------------------------------------------------
diff --git a/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorUtils.java b/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorUtils.java
index e6fcb7d..d27d8cf 100644
--- a/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorUtils.java
+++ b/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorUtils.java
@@ -56,8 +56,8 @@ public class DocumentCreatorUtils {
computeResourcePreference.setOverridebyAiravata(overridebyAiravata);
computeResourcePreference.setAllocationProjectNumber(allocationProjectNumber);
computeResourcePreference.setPreferredBatchQueue(preferredBatchQueue);
- computeResourcePreference.setPreferredDataMovementProtocol(preferredDataMovementProtocol);
- computeResourcePreference.setPreferredJobSubmissionProtocol(preferredJobSubmissionProtocol);
+ computeResourcePreference.setPreferredDataMovementProtocol(DataMovementProtocol.valueOf(preferredDataMovementProtocol));
+ computeResourcePreference.setPreferredJobSubmissionProtocol(JobSubmissionProtocol.valueOf(preferredJobSubmissionProtocol));
computeResourcePreference.setScratchLocation(scratchLocation);
return computeResourcePreference;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/ce1354e9/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/JobExecutionContext.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/JobExecutionContext.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/JobExecutionContext.java
index 30142f8..a9d1bb4 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/JobExecutionContext.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/JobExecutionContext.java
@@ -279,7 +279,7 @@ public class JobExecutionContext extends AbstractContext implements Serializable
}
public SecurityContext getSecurityContext(String name) throws GFacException{
- SecurityContext secContext = securityContext.get(name+"-"+this.getApplicationContext().getHostDescription().getType().getHostAddress());
+ SecurityContext secContext = securityContext.get(name+"-"+this.getHostName());
return secContext;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/ce1354e9/modules/gfac/pom.xml
----------------------------------------------------------------------
diff --git a/modules/gfac/pom.xml b/modules/gfac/pom.xml
index ed3e27d..dd38b6f 100644
--- a/modules/gfac/pom.xml
+++ b/modules/gfac/pom.xml
@@ -35,10 +35,10 @@
<module>gfac-ec2</module>
<module>gfac-ssh</module>
<module>gfac-local</module>
- <module>gfac-hadoop</module>
- <module>gfac-gram</module>
+ <!--<module>gfac-hadoop</module>-->
+ <!--<module>gfac-gram</module>-->
<module>gfac-gsissh</module>
- <module>gfac-bes</module>
+ <!--<module>gfac-bes</module>-->
<module>gfac-monitor</module>
<module>airavata-gfac-service</module>
</modules>
http://git-wip-us.apache.org/repos/asf/airavata/blob/ce1354e9/modules/integration-tests/src/test/java/org/apache/airavata/integration/tools/DocumentCreatorUtils.java
----------------------------------------------------------------------
diff --git a/modules/integration-tests/src/test/java/org/apache/airavata/integration/tools/DocumentCreatorUtils.java b/modules/integration-tests/src/test/java/org/apache/airavata/integration/tools/DocumentCreatorUtils.java
index 3cfff87..2fc3ac2 100644
--- a/modules/integration-tests/src/test/java/org/apache/airavata/integration/tools/DocumentCreatorUtils.java
+++ b/modules/integration-tests/src/test/java/org/apache/airavata/integration/tools/DocumentCreatorUtils.java
@@ -52,8 +52,8 @@ public class DocumentCreatorUtils {
computeResourcePreference.setOverridebyAiravata(overridebyAiravata);
computeResourcePreference.setAllocationProjectNumber(allocationProjectNumber);
computeResourcePreference.setPreferredBatchQueue(preferredBatchQueue);
- computeResourcePreference.setPreferredDataMovementProtocol(preferredDataMovementProtocol);
- computeResourcePreference.setPreferredJobSubmissionProtocol(preferredJobSubmissionProtocol);
+ computeResourcePreference.setPreferredDataMovementProtocol(DataMovementProtocol.valueOf(preferredDataMovementProtocol));
+ computeResourcePreference.setPreferredJobSubmissionProtocol(JobSubmissionProtocol.valueOf(preferredJobSubmissionProtocol));
computeResourcePreference.setScratchLocation(scratchLocation);
return computeResourcePreference;
}