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/07 19:01:04 UTC
[23/44] airavata git commit: fixing merge conflicts
fixing merge conflicts
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/847f2d93
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/847f2d93
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/847f2d93
Branch: refs/heads/mongo-registry
Commit: 847f2d93009e2a2e2fd61418140c6cf42fdee367
Parents: 9306457 9f3d55b
Author: Supun Nakandala <sc...@apache.org>
Authored: Wed May 27 00:30:23 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Wed May 27 00:30:23 2015 +0530
----------------------------------------------------------------------
.../airavata/api/server/AiravataAPIServer.java | 1 -
.../api/server/AiravataDerbyServer.java | 1 -
.../handler/AiravataServerHandlerTest.java | 1 -
.../app/catalog/test/AppDeploymentTest.java | 1 -
.../app/catalog/test/AppInterfaceTest.java | 1 -
.../app/catalog/test/ComputeResourceTest.java | 1 -
.../app/catalog/test/GatewayProfileTest.java | 1 -
.../airavata/common/utils/AiravataUtils.java | 28 --------------------
.../common/utils/ApplicationSettings.java | 9 +------
.../common/utils/ApplicationSettingsTest.java | 1 -
.../servlet/CredentialStoreCallbackServlet.java | 1 -
.../store/store/impl/db/SSHCredentialTest.java | 1 -
.../credential/store/client/TestSSLClient.java | 1 -
.../airavata/gfac/client/util/Initialize.java | 1 -
.../core/monitor/AiravataJobStatusUpdator.java | 25 ++++++++++-------
.../core/monitor/AiravataTaskStatusUpdator.java | 8 +++---
.../AiravataWorkflowNodeStatusUpdator.java | 15 ++++++-----
.../apache/airavata/job/GFacConfigXmlTest.java | 2 --
.../GSISecurityContextTestWithMyProxyAuth.java | 1 -
.../gfac/monitor/email/EmailBasedMonitor.java | 3 ++-
.../messaging/client/RabbitMQListener.java | 1 -
.../airavata/messaging/core/TestClient.java | 1 -
.../orchestrator/client/util/Initialize.java | 1 -
.../orchestrator/core/util/Initialize.java | 1 -
.../registry/jpa/util/Initialize.java | 1 -
.../org/apache/airavata/server/ServerMain.java | 1 -
.../multitenantedairavata/GatewayRegister.java | 1 -
27 files changed, 32 insertions(+), 78 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/847f2d93/airavata-api/airavata-api-server/src/test/java/org/apache/airavata/api/server/handler/AiravataServerHandlerTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/847f2d93/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/AiravataJobStatusUpdator.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/847f2d93/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java
----------------------------------------------------------------------