airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Date Tue, 04 Feb 2014 20:36:40 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/45df543e
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/45df543e
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/45df543e

Branch: refs/heads/master
Commit: 45df543e98eae717f9c33b9fceed04ca8907b500
Parents: f2eaba0 10b41d8
Author: lahiru <lahiru@apache.org>
Authored: Tue Feb 4 15:36:29 2014 -0500
Committer: lahiru <lahiru@apache.org>
Committed: Tue Feb 4 15:36:29 2014 -0500

----------------------------------------------------------------------
 .../core/AbstractOrchestratorTest.java          |   2 +-
 .../orchestrator/core/util/Initialize.java      |   2 +-
 .../test/resources/airavata-registry-derby.sql  | 317 +++++++++
 .../src/test/resources/data-derby.sql           | 282 --------
 modules/registry/airavata-jpa-registry/pom.xml  |  91 +++
 .../persistance/registry/jpa/ResourceType.java  |   6 +-
 .../persistance/registry/jpa/ResourceUtils.java |   2 +-
 .../registry/jpa/impl/AiravataJPARegistry.java  | 125 ++--
 .../jpa/model/Application_Descriptor.java       |  10 +-
 .../registry/jpa/model/Configuration.java       |  44 +-
 .../registry/jpa/model/Execution_Error.java     |  42 +-
 .../registry/jpa/model/Experiment.java          | 178 ++---
 .../model/Experiment_Configuration_Data.java    | 225 ++++++
 .../registry/jpa/model/Experiment_Data.java     | 129 ++--
 .../registry/jpa/model/Experiment_Input.java    |  76 ++
 .../registry/jpa/model/Experiment_Input_PK.java |  61 ++
 .../registry/jpa/model/Experiment_Metadata.java | 127 +++-
 .../registry/jpa/model/Experiment_Output.java   |  75 ++
 .../jpa/model/Experiment_Output_PK.java         |  61 ++
 .../registry/jpa/model/Experiment_Summary.java  |  64 ++
 .../registry/jpa/model/GFac_Job_Data.java       |  27 +-
 .../registry/jpa/model/GFac_Job_Status.java     |   6 +-
 .../persistance/registry/jpa/model/Gateway.java |   5 +
 .../registry/jpa/model/Gateway_Worker.java      |   7 +-
 .../registry/jpa/model/Gram_Data.java           |  10 +-
 .../registry/jpa/model/Host_Descriptor.java     |   8 +-
 .../registry/jpa/model/Node_Data.java           |  18 +-
 .../registry/jpa/model/Orchestrator.java        |  25 +-
 .../persistance/registry/jpa/model/Project.java |   6 +-
 .../registry/jpa/model/Published_Workflow.java  |  11 +-
 .../registry/jpa/model/Service_Descriptor.java  |   8 +-
 .../registry/jpa/model/User_Workflow.java       |  10 +-
 .../persistance/registry/jpa/model/Users.java   |  10 +-
 .../registry/jpa/model/Workflow_Data.java       |  26 +-
 .../jpa/resources/AbstractResource.java         |  69 +-
 .../ApplicationDescriptorResource.java          |   2 +-
 .../jpa/resources/ExecutionErrorResource.java   |  18 +-
 .../resources/ExperimentConfigDataResource.java | 284 ++++++++
 .../jpa/resources/ExperimentDataResource.java   | 713 ++++++++++---------
 .../jpa/resources/ExperimentDataRetriever.java  | 134 ++--
 .../jpa/resources/ExperimentInputResource.java  | 111 +++
 .../resources/ExperimentMetadataResource.java   | 432 ++++++++++-
 .../jpa/resources/ExperimentOutputResource.java | 111 +++
 .../jpa/resources/ExperimentResource.java       | 571 +++++++--------
 .../resources/ExperimentSummaryResource.java    | 110 +++
 .../jpa/resources/GFacJobDataResource.java      |  26 +-
 .../jpa/resources/GFacJobStatusResource.java    |   1 -
 .../registry/jpa/resources/GatewayResource.java |  46 +-
 .../jpa/resources/HostDescriptorResource.java   |   3 -
 .../registry/jpa/resources/ProjectResource.java |  61 +-
 .../registry/jpa/resources/Utils.java           | 168 +++--
 .../registry/jpa/resources/WorkerResource.java  |  51 +-
 .../jpa/resources/WorkflowDataResource.java     |   2 +-
 .../src/main/resources/META-INF/persistence.xml |   7 +-
 .../main/resources/airavata-registry-derby.sql  | 317 +++++++++
 .../main/resources/airavata-registry-mysql.sql  | 319 +++++++++
 .../src/main/resources/data-derby.sql           | 282 --------
 .../src/main/resources/data-mysql.sql           | 279 --------
 .../registry/jpa/AbstractResourceTest.java      |  11 +-
 .../jpa/ExecutionErrorResourceTest.java         |  32 +-
 .../jpa/ExperimentDataResourceTest.java         | 214 +++---
 .../jpa/ExperimentMetadataResourceTest.java     |  42 +-
 .../registry/jpa/ExperimentResourceTest.java    | 162 ++---
 .../registry/jpa/GFacJobDataResourceTest.java   |  16 +-
 .../registry/jpa/GFacJobStatusResourceTest.java |  13 +-
 .../registry/jpa/GatewayResourceTest.java       |  18 +-
 .../registry/jpa/GramDataResourceTest.java      |  12 +-
 .../registry/jpa/NodeDataResourceTest.java      |  12 +-
 .../jpa/OrchestratorDataResourceTest.java       |  32 +-
 .../registry/jpa/PersistentDataTestSuite.java   |  49 --
 .../registry/jpa/ProjectResourceTest.java       |  38 +-
 .../registry/jpa/WorkerResourceTest.java        |  56 +-
 .../registry/jpa/WorkflowDataResourceTest.java  |  16 +-
 .../registry/jpa/util/Initialize.java           |   2 +-
 .../test/resources/airavata-registry-derby.sql  | 317 +++++++++
 .../src/test/resources/data-derby.sql           | 292 --------
 .../api/test/AiravataRegistryAPITest.java       |  76 +-
 .../registry/api/test/util/Initialize.java      |   2 +-
 .../test/resources/airavata-registry-derby.sql  | 317 +++++++++
 .../src/test/resources/data-derby.sql           | 283 --------
 pom.xml                                         |   2 +-
 81 files changed, 5143 insertions(+), 3084 deletions(-)
----------------------------------------------------------------------



Mime
View raw message