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/08/17 15:14:33 UTC
[1/2] airavata git commit: setting default gateway request cretion
time
Repository: airavata
Updated Branches:
refs/heads/develop b284167d2 -> 779cc376e
setting default gateway request cretion time
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/67102da4
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/67102da4
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/67102da4
Branch: refs/heads/develop
Commit: 67102da4443e92d99d5750c1fa204e87fe6e8a30
Parents: c6a82a0
Author: scnakandala <su...@gmail.com>
Authored: Tue Aug 16 21:14:08 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Tue Aug 16 21:14:08 2016 -0400
----------------------------------------------------------------------
.../registry/core/experiment/catalog/impl/GatewayRegistry.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/67102da4/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/GatewayRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/GatewayRegistry.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/GatewayRegistry.java
index 37d8820..515b83b 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/GatewayRegistry.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/GatewayRegistry.java
@@ -66,7 +66,7 @@ public class GatewayRegistry {
resource.setDeclinedReason(gateway.getDeclinedReason());
resource.setOauthClientId(gateway.getOauthClientId());
resource.setOauthClientSecret(gateway.getOauthClientSecret());
- resource.setRequestCreationTime(new Timestamp(gateway.getRequestCreationTime()));
+ resource.setRequestCreationTime(new Timestamp(System.currentTimeMillis()));
resource.save();
return gateway.getGatewayId();
}catch (RegistryException e){
@@ -94,7 +94,6 @@ public class GatewayRegistry {
existingGateway.setDeclinedReason(updatedGateway.getDeclinedReason());
existingGateway.setOauthClientId(updatedGateway.getOauthClientId());
existingGateway.setOauthClientSecret(updatedGateway.getOauthClientSecret());
- existingGateway.setRequestCreationTime(new Timestamp(updatedGateway.getRequestCreationTime()));
existingGateway.save();
}catch (RegistryException e){
logger.error("Error while updating gateway to registry", e);
[2/2] airavata git commit: merging develop
Posted by sc...@apache.org.
merging develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/779cc376
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/779cc376
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/779cc376
Branch: refs/heads/develop
Commit: 779cc376ef7c25a60586214cd7bb06056fdaaf79
Parents: 67102da b284167
Author: scnakandala <su...@gmail.com>
Authored: Wed Aug 17 11:14:20 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Aug 17 11:14:20 2016 -0400
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 13 ++---
.../org/apache/airavata/gfac/impl/Factory.java | 14 +++--
.../airavata/gfac/server/GfacServerHandler.java | 5 +-
.../messaging/core/MessagingFactory.java | 6 +--
.../messaging/core/impl/RabbitMQPublisher.java | 2 +-
.../messaging/core/impl/RabbitMQSubscriber.java | 4 +-
.../server/OrchestratorServerHandler.java | 56 +++++++++++++++-----
7 files changed, 70 insertions(+), 30 deletions(-)
----------------------------------------------------------------------