Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4E88A18770 for ; Mon, 1 Feb 2016 21:49:02 +0000 (UTC) Received: (qmail 39593 invoked by uid 500); 1 Feb 2016 21:48:40 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 39516 invoked by uid 500); 1 Feb 2016 21:48:40 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 39419 invoked by uid 99); 1 Feb 2016 21:48:40 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Feb 2016 21:48:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E10A2E031B; Mon, 1 Feb 2016 21:48:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shameera@apache.org To: commits@airavata.apache.org Date: Mon, 01 Feb 2016 21:48:41 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] airavata git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata into develop Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata into develop Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ad011612 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ad011612 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ad011612 Branch: refs/heads/develop Commit: ad0116126d12b6b2afdd43c60f3190884a56d9d2 Parents: 225f462 72a6f6a Author: Shameera Rathnayaka Authored: Mon Feb 1 16:48:26 2016 -0500 Committer: Shameera Rathnayaka Committed: Mon Feb 1 16:48:26 2016 -0500 ---------------------------------------------------------------------- .../workflow/catalog/model/ComponentStatus.java | 78 +++++++++ .../core/workflow/catalog/model/Edge.java | 103 ++++++++++++ .../core/workflow/catalog/model/Edge_PK.java | 64 +++++++ .../core/workflow/catalog/model/Node.java | 124 ++++++++++++++ .../core/workflow/catalog/model/Node_PK.java | 64 +++++++ .../core/workflow/catalog/model/Port.java | 102 ++++++++++++ .../core/workflow/catalog/model/Port_PK.java | 64 +++++++ .../core/workflow/catalog/model/Workflow.java | 124 ++++++++++++++ .../catalog/model/WorkflowInput_PK.java | 64 +++++++ .../catalog/model/WorkflowIntInput.java | 166 +++++++++++++++++++ .../workflow/catalog/model/WorkflowOutput.java | 156 +++++++++++++++++ .../catalog/model/WorkflowOutput_PK.java | 64 +++++++ .../workflow/catalog/model/WorkflowStatus.java | 103 ++++++++++++ .../catalog/model/WorkflowStatus_PK.java | 64 +++++++ .../src/main/resources/workflow-derby.sql | 123 ++++++++++++++ .../src/main/resources/workflow-mysql.sql | 123 ++++++++++++++ 16 files changed, 1586 insertions(+) ----------------------------------------------------------------------