You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2015/04/26 06:12:25 UTC
[2/3] airavata git commit: Merge branch 'master' of
https://github.com/apache/airavata
Merge branch 'master' of https://github.com/apache/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/be997dda
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/be997dda
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/be997dda
Branch: refs/heads/master
Commit: be997dda997032751609bb60639319b16698f92f
Parents: cb600a1 851aa62
Author: Supun Nakandala <su...@gmail.com>
Authored: Sun Apr 26 07:36:24 2015 +0530
Committer: Supun Nakandala <su...@gmail.com>
Committed: Sun Apr 26 07:36:24 2015 +0530
----------------------------------------------------------------------
airavata-api/airavata-api-server/pom.xml | 17 +-
.../airavata/api/server/AiravataAPIServer.java | 157 +---
.../server/handler/AiravataServerHandler.java | 4 +-
.../AiravataExperimentStatusUpdator.java | 32 +-
.../util/AiravataServerThreadPoolExecutor.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 +-
.../client/samples/CreateLaunchExperiment.java | 14 +-
.../client/samples/RegisterSampleData.java | 12 +-
.../tools/RegisterOGCEUS3Application.java | 4 +-
.../tools/RegisterSampleApplications.java | 322 ++++----
.../tools/RegisterSampleApplicationsUtils.java | 11 +-
.../client/tools/RegisterUS3Application.java | 2 +-
.../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/AiravataZKUtils.java | 38 +-
.../airavata/common/utils/ServerSettings.java | 31 +-
.../client/src/main/resources/log4j.properties | 1 +
.../server/src/main/resources/PBSTemplate.xslt | 1 -
.../src/main/resources/SLURMTemplate.xslt | 1 -
.../main/resources/airavata-server.properties | 9 +-
.../server/src/main/resources/log4j.properties | 6 +-
.../apache/airavata/gfac/server/GfacServer.java | 2 +-
.../airavata/gfac/server/GfacServerHandler.java | 22 +-
.../airavata/gfac/core/cpi/BetterGfacImpl.java | 92 ++-
.../core/monitor/GfacInternalStatusUpdator.java | 63 +-
.../gfac/core/utils/GFacThreadPoolExecutor.java | 4 +-
.../airavata/gfac/core/utils/GFacUtils.java | 136 ++--
.../gfac/core/utils/InputHandlerWorker.java | 1 -
.../gsissh/provider/impl/GSISSHProvider.java | 13 +-
.../gfac/gsissh/util/GFACGSISSHUtils.java | 25 +-
.../gfac/monitor/email/EmailBasedMonitor.java | 245 +++---
.../gfac/monitor/email/EmailMonitorFactory.java | 41 +-
.../gfac/monitor/email/JobStatusResult.java | 11 +
.../gfac/monitor/email/parser/EmailParser.java | 1 +
.../monitor/email/parser/LSFEmailParser.java | 74 ++
.../email/parser/LonestarEmailParser.java | 74 --
.../monitor/email/parser/PBSEmailParser.java | 9 +-
.../monitor/email/parser/SLURMEmailParser.java | 7 +-
.../monitor/impl/pull/qstat/HPCPullMonitor.java | 8 +-
.../gfac/ssh/provider/impl/SSHProvider.java | 106 ++-
.../airavata/gfac/ssh/util/GFACSSHUtils.java | 106 ++-
.../server/OrchestratorServerHandler.java | 76 +-
.../OrchestratorServerThreadPoolExecutor.java | 2 +-
.../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 +-
.../ApplicationRegister.java | 99 ++-
.../ComputeResourceRegister.java | 68 +-
.../ExperimentExecution.java | 101 ++-
.../FrameworkBootstrapping.java | 12 +-
.../TestFrameworkProps.java | 10 +
.../utils/TestFrameworkConstants.java | 4 +
.../src/main/resources/test-framework.json | 23 +-
90 files changed, 2125 insertions(+), 3291 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/be997dda/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
----------------------------------------------------------------------