You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2015/06/02 11:40:45 UTC

[2/2] airavata git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata

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/c8a70e9b
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c8a70e9b
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c8a70e9b

Branch: refs/heads/master
Commit: c8a70e9b40ff088df5b048d443979571aa775f2f
Parents: ebed378 4476dfc
Author: Supun Nakandala <sc...@apache.org>
Authored: Tue Jun 2 15:08:51 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Tue Jun 2 15:08:51 2015 +0530

----------------------------------------------------------------------
 .../api/server/util/RegistryInitUtil.java       |   2 +-
 .../client/samples/CreateLaunchExperiment.java  |  14 +-
 .../main/resources/airavata-server.properties   |   1 +
 .../airavata/gfac/client/util/Initialize.java   |   2 +-
 .../gfac-application-specific-handlers/pom.xml  |   2 +-
 .../org/apache/airavata/gfac/Constants.java     |   2 +
 .../gfac/monitor/email/EmailBasedMonitor.java   |   2 +
 .../gfac/ssh/handler/SSHOutputHandler.java      |   4 +-
 modules/integration-tests/pom.xml               |   2 +-
 .../orchestrator/client/util/Initialize.java    |   2 +-
 .../orchestrator/core/util/Initialize.java      |   2 +-
 .../registry/jpa/impl/ExperimentRegistry.java   | 258 +++++++------
 .../registry/jpa/impl/ProjectRegistry.java      |   7 +-
 .../jpa/model/AdvancedInputDataHandling.java    |  16 -
 .../jpa/model/AdvancedOutputDataHandling.java   |  15 -
 .../registry/jpa/model/ApplicationInput.java    |   8 -
 .../registry/jpa/model/ApplicationOutput.java   |   8 -
 .../Computational_Resource_Scheduling.java      |  16 -
 .../registry/jpa/model/DataTransferDetail.java  |  12 +-
 .../registry/jpa/model/ErrorDetail.java         |  30 +-
 .../registry/jpa/model/Experiment.java          | 138 +++++--
 .../jpa/model/ExperimentConfigData.java         |  53 ++-
 .../registry/jpa/model/Experiment_Input.java    |   8 -
 .../registry/jpa/model/Experiment_Output.java   |   8 -
 .../registry/jpa/model/JobDetail.java           |  32 +-
 .../registry/jpa/model/NodeInput.java           |  10 +-
 .../registry/jpa/model/NodeOutput.java          |  10 +-
 .../registry/jpa/model/Notification_Email.java  |  18 +-
 .../registry/jpa/model/QosParam.java            |  16 -
 .../persistance/registry/jpa/model/Status.java  |  38 +-
 .../registry/jpa/model/TaskDetail.java          | 122 ++++++-
 .../registry/jpa/model/WorkflowNodeDetail.java  |  66 +++-
 .../AdvanceInputDataHandlingResource.java       |  38 +-
 .../AdvancedOutputDataHandlingResource.java     |  39 +-
 .../jpa/resources/ApplicationInputResource.java |  42 +--
 .../resources/ApplicationOutputResource.java    |  20 +-
 .../ComputationSchedulingResource.java          |  30 +-
 .../jpa/resources/ConfigDataResource.java       |  55 ++-
 .../resources/DataTransferDetailResource.java   |  38 +-
 .../jpa/resources/ErrorDetailResource.java      |  71 ++--
 .../jpa/resources/ExperimentInputResource.java  |  19 +-
 .../jpa/resources/ExperimentOutputResource.java |  20 +-
 .../jpa/resources/ExperimentResource.java       | 171 ++++++---
 .../registry/jpa/resources/GatewayResource.java |   6 +-
 .../jpa/resources/JobDetailResource.java        |  39 +-
 .../jpa/resources/NodeInputResource.java        |  19 +-
 .../jpa/resources/NodeOutputResource.java       |  19 +-
 .../resources/NotificationEmailResource.java    |  30 +-
 .../registry/jpa/resources/ProjectResource.java |  45 +--
 .../jpa/resources/QosParamResource.java         |  30 +-
 .../registry/jpa/resources/StatusResource.java  |  62 ++--
 .../jpa/resources/TaskDetailResource.java       | 139 +++++--
 .../registry/jpa/resources/Utils.java           | 360 +++++++++++++------
 .../registry/jpa/resources/WorkerResource.java  |  61 ++--
 .../resources/WorkflowNodeDetailResource.java   |  80 ++++-
 .../jpa/utils/ThriftDataModelConversion.java    |  21 +-
 .../jpa/ComputationalSchedulingTest.java        |   2 +-
 .../jpa/ExperimentInputResourceTest.java        |   4 +-
 .../jpa/ExperimentOutputResourceTest.java       |   4 +-
 .../registry/jpa/ExperimentResourceTest.java    |   2 +-
 .../registry/jpa/GatewayResourceTest.java       |   2 +-
 .../registry/jpa/TaskDetailResourceTest.java    |   6 +-
 .../jpa/WorkflowNodeDetailResourceTest.java     |   4 +-
 .../registry/jpa/util/Initialize.java           |   2 +-
 64 files changed, 1399 insertions(+), 1005 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/c8a70e9b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ProjectRegistry.java
----------------------------------------------------------------------