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: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Date Mon, 13 Apr 2015 21:15:51 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata


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

Branch: refs/heads/master
Commit: 2b935a4a76b82b58bafe357b13d84739ada7121a
Parents: 2dbd798 a4daa52
Author: Lahiru Gunathilake <glahiru@gmail.com>
Authored: Mon Apr 13 17:15:48 2015 -0400
Committer: Lahiru Gunathilake <glahiru@gmail.com>
Committed: Mon Apr 13 17:15:48 2015 -0400

----------------------------------------------------------------------
 .../server/handler/AiravataServerHandler.java   |   4 +-
 .../java/org/apache/airavata/api/Airavata.java  | 133 +++++++-
 .../main/resources/lib/airavata/Airavata.cpp    |  25 +-
 .../src/main/resources/lib/airavata/Airavata.h  |  27 +-
 .../lib/airavata/Airavata_server.skeleton.cpp   |   2 +-
 .../resources/lib/Airavata/API/Airavata.php     |  29 +-
 .../lib/apache/airavata/api/Airavata-remote     |   8 +-
 .../lib/apache/airavata/api/Airavata.py         |  27 +-
 .../client/samples/CancelExperiments.java       |   3 +-
 .../tools/RegisterSampleApplications.java       |   4 +-
 airavata-api/generate-thrift-files.sh           |   2 +-
 .../airavataAPI.thrift                          |   2 +-
 .../catalog/data/impl/ComputeResourceImpl.java  |  23 +-
 .../data/model/EmailMonitorProperty.java        | 111 +++++++
 .../catalog/data/model/SshJobSubmission.java    |  13 +
 .../data/resources/AbstractResource.java        |   5 +
 .../data/resources/EmailPropertyResource.java   | 309 +++++++++++++++++++
 .../resources/SshJobSubmissionResource.java     |  13 +-
 .../catalog/data/util/AppCatalogJPAUtils.java   |  23 ++
 .../data/util/AppCatalogResourceType.java       |   3 +-
 .../data/util/AppCatalogThriftConversion.java   |  34 +-
 .../src/main/resources/META-INF/persistence.xml |   1 +
 .../src/main/resources/appcatalog-derby.sql     |  17 +
 .../src/main/resources/appcatalog-mysql.sql     |  13 +
 .../app/catalog/test/ComputeResourceTest.java   |  11 +
 .../src/test/resources/appcatalog-derby.sql     |  15 +
 .../airavata/common/utils/ServerSettings.java   |  29 +-
 .../main/resources/airavata-server.properties   |   9 +-
 .../gsissh/provider/impl/GSISSHProvider.java    |   3 +-
 .../gfac/monitor/email/EmailBasedMonitor.java   |  18 +-
 .../gfac/monitor/email/EmailMonitorFactory.java |  18 +-
 .../monitor/email/parser/PBSEmailParser.java    |  42 ---
 .../monitor/email/parser/SLURMEmailParser.java  |  25 +-
 .../gfac/ssh/provider/impl/SSHProvider.java     |   6 +-
 .../server/OrchestratorServerHandler.java       |   8 +-
 .../util/OrchestratorRecoveryHandler.java       |   2 +-
 .../orchestrator/cpi/OrchestratorService.java   | 125 +++++++-
 .../core/impl/GFACEmbeddedJobSubmitter.java     |   2 +-
 .../core/impl/GFACPassiveJobSubmitter.java      |  19 +-
 .../core/impl/GFACRPCJobSubmitter.java          |   2 +-
 .../orchestrator/core/job/JobSubmitter.java     |   2 +-
 .../cpi/impl/SimpleOrchestratorImpl.java        |   2 +-
 .../generate-orchestrator-stubs.sh              |   2 +-
 .../orchestrator.cpi.service.thrift             |   2 +-
 .../TestFrameworkProps.java                     |  26 ++
 .../src/main/resources/test-framework.json      |   0
 46 files changed, 1002 insertions(+), 197 deletions(-)
----------------------------------------------------------------------



Mime
View raw message