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 2016/03/10 18:41:04 UTC
[1/2] airavata git commit: checking set archive is null
Repository: airavata
Updated Branches:
refs/heads/develop 0888365ca -> a1df4ad71
checking set archive is null
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/cf4f3f59
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/cf4f3f59
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/cf4f3f59
Branch: refs/heads/develop
Commit: cf4f3f596e755e71d030a063d4dafa7c5a050835
Parents: 75fb3b3
Author: scnakandala <su...@gmail.com>
Authored: Thu Mar 10 12:40:54 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Thu Mar 10 12:40:54 2016 -0500
----------------------------------------------------------------------
.../registry/core/experiment/catalog/resources/Utils.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/cf4f3f59/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
index 1a6c4e2..595bc63 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
@@ -425,7 +425,11 @@ public class Utils {
experimentResource.setGatewayInstanceId(o.getGatewayInstanceId());
experimentResource.setEnableEmailNotification(o.getEnableEmailNotification());
experimentResource.setEmailAddresses(o.getEmailAddresses());
- experimentResource.setArchive(o.getArchive());
+ if(o.getArchive() == null){
+ experimentResource.setArchive(false);
+ }else {
+ experimentResource.setArchive(o.getArchive());
+ }
}
return experimentResource;
}
[2/2] airavata git commit: Merge remote-tracking branch
'origin/develop' into develop
Posted by sc...@apache.org.
Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a1df4ad7
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a1df4ad7
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a1df4ad7
Branch: refs/heads/develop
Commit: a1df4ad71e2f79f22c25f11bce25cf8f48390dc6
Parents: cf4f3f5 0888365
Author: scnakandala <su...@gmail.com>
Authored: Thu Mar 10 12:40:58 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Thu Mar 10 12:40:58 2016 -0500
----------------------------------------------------------------------
.../application_interface_model_types.cpp | 22 +++
.../application_interface_model_types.h | 12 +-
.../Model/AppCatalog/AppInterface/Types.php | 23 +++
.../model/appcatalog/appinterface/ttypes.py | 15 +-
.../ApplicationInterfaceDescription.java | 113 ++++++++++++-
.../main/resources/airavata-server.properties | 3 +-
.../org/apache/airavata/gfac/impl/Factory.java | 5 +
.../airavata/gfac/impl/GFacEngineImpl.java | 19 ++-
.../airavata/gfac/impl/task/ArchiveTask.java | 161 ++++++++++++++++++-
.../cpi/impl/SimpleOrchestratorImpl.java | 62 ++++---
.../catalog/impl/ApplicationInterfaceImpl.java | 2 +
.../app/catalog/model/ApplicationInterface.java | 11 +-
.../catalog/resources/AppInterfaceResource.java | 11 ++
.../util/AppCatalogThriftConversion.java | 1 +
.../src/main/resources/appcatalog-derby.sql | 1 +
.../src/main/resources/appcatalog-mysql.sql | 6 +-
.../application_interface_model.thrift | 3 +-
17 files changed, 427 insertions(+), 43 deletions(-)
----------------------------------------------------------------------