airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject [2/2] airavata git commit: committing changes
Date Wed, 22 Apr 2015 21:20:21 GMT
committing changes


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

Branch: refs/heads/master
Commit: ab070e1797105e6755f623b6bd349949007039f9
Parents: 6409f07 bbb43ff
Author: Lahiru Gunathilake <glahiru@gmail.com>
Authored: Wed Apr 22 17:20:20 2015 -0400
Committer: Lahiru Gunathilake <glahiru@gmail.com>
Committed: Wed Apr 22 17:20:20 2015 -0400

----------------------------------------------------------------------
 .../server/handler/AiravataServerHandler.java   |   4 +-
 .../lib/airavata/computeResourceModel_types.cpp | 396 +++------
 .../lib/airavata/computeResourceModel_types.h   |  91 +--
 .../lib/airavata/experimentModel_types.cpp      |  82 +-
 .../lib/airavata/experimentModel_types.h        |  46 +-
 .../Model/AppCatalog/ComputeResource/Types.php  | 186 -----
 .../Model/Workspace/Experiment/Types.php        |  96 ++-
 .../model/appcatalog/computeresource/ttypes.py  | 160 +---
 .../model/workspace/experiment/ttypes.py        |  86 +-
 .../tools/RegisterSampleApplications.java       |  53 +-
 .../computeresource/EmailMonitorProperty.java   | 805 -------------------
 .../computeresource/EmailProtocol.java          |  66 --
 .../computeresource/SSHJobSubmission.java       | 114 +--
 .../model/workspace/experiment/Experiment.java  | 225 ++++--
 .../model/workspace/experiment/JobDetails.java  | 109 ++-
 .../computeResourceModel.thrift                 |  27 -
 .../experimentModel.thrift                      |  24 +-
 .../catalog/data/impl/ComputeResourceImpl.java  |  13 -
 .../data/model/EmailMonitorProperty.java        | 111 ---
 .../catalog/data/model/SshJobSubmission.java    |   1 -
 .../data/resources/EmailPropertyResource.java   | 309 -------
 .../catalog/data/util/AppCatalogJPAUtils.java   |  22 -
 .../data/util/AppCatalogResourceType.java       |   3 +-
 .../data/util/AppCatalogThriftConversion.java   |  18 -
 .../src/main/resources/META-INF/persistence.xml |   1 -
 .../src/main/resources/appcatalog-derby.sql     |  12 -
 .../src/main/resources/appcatalog-mysql.sql     |  11 -
 .../app/catalog/test/ComputeResourceTest.java   |  11 +-
 .../airavata/common/utils/ServerSettings.java   |  31 +-
 .../main/resources/airavata-server.properties   |   7 +
 .../gsissh/provider/impl/GSISSHProvider.java    |  13 +-
 .../gfac/monitor/email/EmailBasedMonitor.java   | 183 +++--
 .../gfac/monitor/email/EmailMonitorFactory.java |  41 +-
 .../monitor/email/parser/LSFEmailParser.java    |  74 ++
 .../email/parser/LonestarEmailParser.java       |  74 --
 .../monitor/email/parser/PBSEmailParser.java    |   1 +
 .../gfac/ssh/provider/impl/SSHProvider.java     |  19 +-
 .../core/validator/JobMetadataValidator.java    |   5 +-
 .../impl/ExperimentStatusValidator.java         |  22 +-
 .../validator/impl/SimpleAppDataValidator.java  |  95 ++-
 .../cpi/impl/SimpleOrchestratorImpl.java        |  46 +-
 .../orchestrator/core/util/SecondValidator.java |  11 +-
 .../orchestrator/core/util/TestValidator.java   |  15 +-
 .../registry/jpa/impl/ExperimentRegistry.java   |   6 +
 .../registry/jpa/model/Experiment.java          |  10 +
 .../registry/jpa/model/JobDetail.java           |  21 +-
 .../jpa/resources/ExperimentResource.java       |  11 +
 .../jpa/resources/JobDetailResource.java        |  22 +
 .../registry/jpa/resources/Utils.java           |   4 +
 .../jpa/utils/ThriftDataModelConversion.java    |   3 +
 .../src/main/resources/registry-derby.sql       |   3 +
 .../src/main/resources/registry-mysql.sql       |   3 +
 .../src/test/resources/registry-derby.sql       |   3 +
 .../test-suite/multi-tenanted-airavata/pom.xml  |  10 +-
 54 files changed, 1159 insertions(+), 2656 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/ab070e17/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java
----------------------------------------------------------------------
diff --cc modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java
index 3095831,6d2583e..b0896d7
--- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java
+++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java
@@@ -21,9 -21,10 +21,10 @@@
  
  package org.apache.airavata.gfac.ssh.provider.impl;
  
 +import org.airavata.appcatalog.cpi.AppCatalog;
  import org.airavata.appcatalog.cpi.AppCatalogException;
+ import org.apache.airavata.common.exception.AiravataException;
  import org.apache.airavata.common.exception.ApplicationSettingsException;
 -import org.apache.airavata.common.utils.ServerSettings;
  import org.apache.airavata.gfac.Constants;
  import org.apache.airavata.gfac.ExecutionMode;
  import org.apache.airavata.gfac.GFacException;
@@@ -49,7 -50,11 +50,15 @@@ import org.apache.airavata.gsi.ssh.impl
  import org.apache.airavata.model.appcatalog.appdeployment.SetEnvPaths;
  import org.apache.airavata.model.appcatalog.appinterface.DataType;
  import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType;
++<<<<<<< HEAD
 +import org.apache.airavata.model.appcatalog.computeresource.*;
++=======
+ import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol;
+ import org.apache.airavata.model.appcatalog.computeresource.MonitorMode;
+ import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManager;
+ import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManagerType;
+ import org.apache.airavata.model.appcatalog.computeresource.SSHJobSubmission;
++>>>>>>> bbb43ffb4ae8fef5041cb8fe9076b4244482c499
  import org.apache.airavata.model.workspace.experiment.CorrectiveAction;
  import org.apache.airavata.model.workspace.experiment.ErrorCategory;
  import org.apache.airavata.model.workspace.experiment.JobDetails;


Mime
View raw message