You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2015/06/30 19:37:22 UTC
[1/2] airavata git commit: Fixing AIRAVATA-1739
Repository: airavata
Updated Branches:
refs/heads/airavata-0.15-release-branch 23daec330 -> efd567947
Fixing AIRAVATA-1739
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/bf85d261
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/bf85d261
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/bf85d261
Branch: refs/heads/airavata-0.15-release-branch
Commit: bf85d261e7605db648255d861e1f1de85e0cb1bb
Parents: 7b9418a
Author: Supun Nakandala <sc...@apache.org>
Authored: Tue Jun 30 23:05:46 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Tue Jun 30 23:05:46 2015 +0530
----------------------------------------------------------------------
.../application/catalog/data/impl/ApplicationInterfaceImpl.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/bf85d261/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 80a974c..4f12eac 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
@@ -106,6 +106,7 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
inputResource.setStandardInput(input.isStandardInput());
inputResource.setAppArgument(input.getApplicationArgument());
inputResource.setInputOrder(input.getInputOrder());
+ inputResource.setDataStaged(input.isDataStaged());
inputResource.setRequired(input.isIsRequired());
inputResource.setRequiredToCMD(input.isRequiredToAddedToCommandLine());
inputResource.save();
@@ -230,6 +231,7 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
inputResource.setStandardInput(input.isStandardInput());
inputResource.setAppArgument(input.getApplicationArgument());
inputResource.setInputOrder(input.getInputOrder());
+ inputResource.setDataStaged(input.isDataStaged());
inputResource.setRequired(input.isIsRequired());
inputResource.setRequiredToCMD(input.isRequiredToAddedToCommandLine());
inputResource.save();
[2/2] airavata git commit: Merge branch
'airavata-0.15-release-branch' of
https://git-wip-us.apache.org/repos/asf/airavata into
airavata-0.15-release-branch
Posted by sc...@apache.org.
Merge branch 'airavata-0.15-release-branch' of https://git-wip-us.apache.org/repos/asf/airavata into airavata-0.15-release-branch
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/efd56794
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/efd56794
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/efd56794
Branch: refs/heads/airavata-0.15-release-branch
Commit: efd56794781246971db17f1de570fb99011f2369
Parents: bf85d26 23daec3
Author: Supun Nakandala <sc...@apache.org>
Authored: Tue Jun 30 23:06:50 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Tue Jun 30 23:06:50 2015 +0530
----------------------------------------------------------------------
.../conf/airavata-client-properties.ini | 45 ++-
.../resources/conf/app-catalog-identifiers.ini | 41 +--
.../tmp_test_multiple_experiments.php | 122 +++++++++
.../main/resources/airavata-server.properties | 1 +
.../gfac/bes/provider/impl/BESProvider.java | 29 +-
.../bes/security/UNICORESecurityContext.java | 19 +-
.../gfac/bes/utils/DataTransferrer.java | 272 ++++++++++++-------
.../gfac/bes/utils/ResourceProcessor.java | 2 -
.../gfac/bes/utils/UASDataStagingProcessor.java | 30 +-
.../airavata/gfac/bes/utils/URIUtils.java | 3 +-
.../org/apache/airavata/gfac/Constants.java | 2 +
.../airavata/gfac/core/cpi/BetterGfacImpl.java | 22 +-
.../gfac/monitor/email/EmailBasedMonitor.java | 54 +++-
.../monitor/impl/pull/qstat/HPCPullMonitor.java | 37 ---
.../impl/push/amqp/SimpleJobFinishConsumer.java | 86 ------
.../gfac/ssh/handler/SSHOutputHandler.java | 6 +-
.../airavata/gfac/ssh/util/HandleOutputs.java | 9 +-
17 files changed, 466 insertions(+), 314 deletions(-)
----------------------------------------------------------------------