airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From er...@apache.org
Subject [2/2] git commit: Resolving conflict in .ini file
Date Fri, 15 Aug 2014 18:39:07 GMT
Resolving conflict in .ini file


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

Branch: refs/heads/master
Commit: 010b85fcf44d75f706c85e632f372b07fb52d296
Parents: c44ec63 d62a957
Author: Eroma Abeysinghe <eroma.abeysinghe@gmail.com>
Authored: Fri Aug 15 14:35:45 2014 -0400
Committer: Eroma Abeysinghe <eroma.abeysinghe@gmail.com>
Committed: Fri Aug 15 14:35:45 2014 -0400

----------------------------------------------------------------------
 .../resources/conf/app-catalog-identifiers.ini  |   3 +-
 .../client/samples/CreateLaunchExperiment.java  |  48 +-
 .../samples/TestCreateLaunchExperiment.java     |  19 +
 .../data/model/ApplicationDeployment.java       |  22 +
 .../data/model/ApplicationInterface.java        |  23 +
 .../catalog/data/model/ApplicationModule.java   |  23 +
 .../catalog/data/model/ComputeResource.java     |  27 +-
 .../data/model/DataMovementInterface.java       |  28 +-
 .../data/model/DataMovementProtocol.java        | 152 ++--
 .../data/model/DataMovementProtocolPK.java      | 148 ++--
 .../catalog/data/model/GatewayProfile.java      |  23 +
 .../catalog/data/model/GridftpDataMovement.java |  27 +-
 .../catalog/data/model/GridftpEndpoint.java     |  30 +-
 .../data/model/JobSubmissionInterface.java      |  28 +-
 .../data/model/JobSubmissionProtocol.java       | 154 ++--
 .../data/model/JobSubmissionProtocolPK.java     | 148 ++--
 .../catalog/data/model/LocalSubmission.java     |  27 +-
 .../catalog/data/model/ResourceJobManager.java  |  23 +
 .../catalog/data/model/ScpDataMovement.java     |  28 +-
 .../catalog/data/model/SshJobSubmission.java    |  28 +-
 .../catalog/data/model/Workflow.java            |  23 +
 .../data/resources/AppDeploymentResource.java   |  21 +
 .../data/resources/AppInterfaceResource.java    |  21 +
 .../data/resources/AppModuleResource.java       |  21 +
 .../data/resources/ComputeResourceResource.java |  25 +-
 .../DataMovementInterfaceResource.java          |  21 +
 .../resources/DataMovementProtocolResource.java | 720 +++++++++----------
 .../data/resources/GatewayProfileResource.java  |  21 +
 .../resources/GridftpDataMovementResource.java  |  21 +
 .../data/resources/GridftpEndpointResource.java |  21 +
 .../JobSubmissionInterfaceResource.java         |  21 +
 .../JobSubmissionProtocolResource.java          | 718 +++++++++---------
 .../data/resources/LocalSubmissionResource.java |  21 +
 .../resources/ResourceJobManagerResource.java   |  21 +
 .../data/resources/ScpDataMovementResource.java |  21 +
 .../resources/SshJobSubmissionResource.java     |  21 +
 .../data/resources/WorkflowResource.java        |  21 +
 .../catalog/data/util/AppCatalogJPAUtils.java   | 126 +++-
 .../data/util/AppCatalogThriftConversion.java   |  32 +-
 .../src/main/resources/META-INF/persistence.xml |   2 -
 .../src/main/resources/appcatalog-derby.sql     |  68 +-
 .../src/main/resources/appcatalog-mysql.sql     |  62 +-
 .../src/test/resources/appcatalog-derby.sql     |  68 +-
 .../airavata/gfac/server/GfacServerHandler.java |   8 +-
 .../gfac/bes/provider/impl/BESProvider.java     |   5 +-
 .../airavata/gfac/core/cpi/BetterGfacImpl.java  | 142 +++-
 .../org/apache/airavata/gfac/core/cpi/GFac.java |   8 +
 .../apache/airavata/gfac/core/cpi/GFacImpl.java |  51 ++
 .../core/monitor/GfacInternalStatusUpdator.java |  11 +-
 .../gfac/core/provider/GFacProvider.java        |   3 +-
 .../org/apache/airavata/job/TestProvider.java   |   2 +-
 .../apache/airavata/gfac/ec2/EC2Provider.java   |   2 +-
 .../gfac/gram/provider/impl/GramProvider.java   |   4 +-
 .../gsissh/provider/impl/GSISSHProvider.java    |   5 +-
 .../hadoop/provider/impl/HadoopProvider.java    |   2 +-
 .../gfac/local/provider/impl/LocalProvider.java |   2 +-
 .../gfac/ssh/provider/impl/SSHProvider.java     |   3 +-
 .../server/OrchestratorServerHandler.java       | 153 +++-
 .../core/impl/GFACEmbeddedJobSubmitter.java     |   4 +
 .../core/impl/GFACServiceJobSubmitter.java      |  56 +-
 .../orchestrator/core/job/JobSubmitter.java     |   9 +
 .../airavata/orchestrator/cpi/Orchestrator.java |   7 +-
 .../cpi/impl/SimpleOrchestratorImpl.java        |  18 +-
 .../src/main/resources/registry-mysql.sql       |   2 +-
 64 files changed, 2390 insertions(+), 1233 deletions(-)
----------------------------------------------------------------------



Mime
View raw message