airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shame...@apache.org
Subject [04/15] git commit: Resolve Merge confilicts and Merge master branch
Date Fri, 26 Sep 2014 15:19:50 GMT
Resolve Merge confilicts and Merge master branch


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b44433c9
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b44433c9
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b44433c9

Branch: refs/heads/orchestratorJobThrottleFeature
Commit: b44433c978a2479e94dc0bfa7c14b8231d2208f4
Parents: 9a138b5 7542f69
Author: shamrath <shameerainfo@gmail.com>
Authored: Thu Sep 18 11:40:08 2014 -0400
Committer: shamrath <shameerainfo@gmail.com>
Committed: Thu Sep 18 11:40:08 2014 -0400

----------------------------------------------------------------------
 .../catalog/data/impl/ComputeResourceImpl.java  |   2 +-
 .../src/main/resources/schemas/jsdl-hpcpa.xsd   | 129 -------
 .../src/main/resources/schemas/jsdl-posix.xsd   | 176 ---------
 .../src/main/resources/schemas/jsdl-spmd.xsd    | 115 ------
 .../src/main/resources/schemas/jsdl.xsd         | 386 -------------------
 .../airavata/gfac/server/GfacServerHandler.java |   3 +
 .../org/apache/airavata/gfac/Constants.java     |   3 +
 .../airavata/gfac/core/monitor/MonitorID.java   |   3 +
 .../gfac/gsissh/util/GFACGSISSHUtils.java       |   3 +-
 .../airavata/gfac/monitor/HPCMonitorID.java     |  27 +-
 .../monitor/impl/pull/qstat/HPCPullMonitor.java |   6 +-
 .../impl/push/amqp/SimpleJobFinishConsumer.java |   4 +-
 .../airavata/gfac/monitor/util/CommonUtils.java | 100 ++---
 .../airavata/gfac/ssh/util/GFACSSHUtils.java    |   4 +-
 .../server/OrchestratorServerHandler.java       |   4 +
 .../apache/airavata/gsi/ssh/api/Cluster.java    |   6 +
 16 files changed, 108 insertions(+), 863 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/b44433c9/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/Constants.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata/blob/b44433c9/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java
----------------------------------------------------------------------
diff --cc modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java
index bd1be1f,dcdbb4d..1b76fa2
--- a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java
+++ b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java
@@@ -32,8 -32,9 +32,9 @@@ import org.apache.airavata.common.utils
  import org.apache.airavata.commons.gfac.type.ActualParameter;
  import org.apache.airavata.commons.gfac.type.HostDescription;
  import org.apache.airavata.commons.gfac.type.MappingFactory;
+ import org.apache.airavata.gfac.Constants;
  import org.apache.airavata.gfac.GFacException;
 -import org.apache.airavata.gfac.RequestData;
 +import org.apache.airavata.common.utils.RequestData;
  import org.apache.airavata.gfac.core.context.JobExecutionContext;
  import org.apache.airavata.gfac.core.context.MessageContext;
  import org.apache.airavata.gfac.gsissh.security.GSISecurityContext;

http://git-wip-us.apache.org/repos/asf/airavata/blob/b44433c9/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/HPCMonitorID.java
----------------------------------------------------------------------
diff --cc modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/HPCMonitorID.java
index 041d145,a4a131d..997de51
--- a/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/HPCMonitorID.java
+++ b/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/HPCMonitorID.java
@@@ -20,10 -20,18 +20,16 @@@ package org.apache.airavata.gfac.monito
  */
  
  import org.apache.airavata.commons.gfac.type.HostDescription;
+ import org.apache.airavata.gfac.Constants;
+ import org.apache.airavata.gfac.GFacException;
+ import org.apache.airavata.gfac.SecurityContext;
  import org.apache.airavata.gfac.core.context.JobExecutionContext;
  import org.apache.airavata.gfac.core.monitor.MonitorID;
 +import org.apache.airavata.credential.store.util.AuthenticationInfo;
+ import org.apache.airavata.gfac.gsissh.security.GSISecurityContext;
+ import org.apache.airavata.gfac.ssh.security.SSHSecurityContext;
 -import org.apache.airavata.gfac.ssh.security.TokenizedSSHAuthInfo;
+ import org.apache.airavata.gsi.ssh.api.ServerInfo;
 -import org.apache.airavata.gsi.ssh.api.authentication.AuthenticationInfo;
  import org.apache.airavata.gsi.ssh.impl.authentication.MyProxyAuthenticationInfo;
 -import org.apache.airavata.model.workspace.experiment.JobState;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  

http://git-wip-us.apache.org/repos/asf/airavata/blob/b44433c9/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata/blob/b44433c9/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata/blob/b44433c9/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
----------------------------------------------------------------------


Mime
View raw message