From commits-return-19329-archive-asf-public=cust-asf.ponee.io@airavata.apache.org Tue Jun 5 23:01:15 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id D74AC180625 for ; Tue, 5 Jun 2018 23:01:14 +0200 (CEST) Received: (qmail 99319 invoked by uid 500); 5 Jun 2018 21:01:14 -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 99310 invoked by uid 99); 5 Jun 2018 21:01:13 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jun 2018 21:01:13 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 6611382AEF; Tue, 5 Jun 2018 21:01:13 +0000 (UTC) Date: Tue, 05 Jun 2018 21:01:13 +0000 To: "commits@airavata.apache.org" Subject: [airavata] branch group-based-auth updated: AIRAVATA-2801 Fixing USE_USER_CR_PREF column name MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <152823247333.6528.8682215737705445629@gitbox.apache.org> From: machristie@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: airavata X-Git-Refname: refs/heads/group-based-auth X-Git-Reftype: branch X-Git-Oldrev: 21fc75ec27051d83feb006a3a1c61e0c01b849bb X-Git-Newrev: 10753c592e09cea51691ef23b28ad66403910da8 X-Git-Rev: 10753c592e09cea51691ef23b28ad66403910da8 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch group-based-auth in repository https://gitbox.apache.org/repos/asf/airavata.git The following commit(s) were added to refs/heads/group-based-auth by this push: new 10753c5 AIRAVATA-2801 Fixing USE_USER_CR_PREF column name 10753c5 is described below commit 10753c592e09cea51691ef23b28ad66403910da8 Author: Marcus Christie AuthorDate: Tue Jun 5 17:00:18 2018 -0400 AIRAVATA-2801 Fixing USE_USER_CR_PREF column name --- .../airavata/registry/core/entities/expcatalog/ProcessEntity.java | 2 +- modules/registry-refactoring/src/main/resources/expcatalog-derby.sql | 1 + modules/registry-refactoring/src/main/resources/expcatalog-mysql.sql | 1 + .../registry/core/repositories/expcatalog/ProcessRepositoryTest.java | 2 ++ 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java index 4985102..343bc79 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java @@ -92,7 +92,7 @@ public class ProcessEntity implements Serializable { @Column(name = "GROUP_RESOURCE_PROFILE_ID") private String groupResourceProfileId; - @Column(name = "IS_USE_USER_CR_PREF") + @Column(name = "USE_USER_CR_PREF") private boolean useUserCRPref; @OneToMany(targetEntity = ProcessStatusEntity.class, cascade = CascadeType.ALL, diff --git a/modules/registry-refactoring/src/main/resources/expcatalog-derby.sql b/modules/registry-refactoring/src/main/resources/expcatalog-derby.sql index d513284..06efd1a 100644 --- a/modules/registry-refactoring/src/main/resources/expcatalog-derby.sql +++ b/modules/registry-refactoring/src/main/resources/expcatalog-derby.sql @@ -233,6 +233,7 @@ CREATE TABLE PROCESS ( EXPERIMENT_DATA_DIR VARCHAR (512), USERNAME VARCHAR (255), GROUP_RESOURCE_PROFILE_ID VARCHAR (255) DEFAULT NULL, + USE_USER_CR_PREF BOOLEAN, PRIMARY KEY (PROCESS_ID), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE ); diff --git a/modules/registry-refactoring/src/main/resources/expcatalog-mysql.sql b/modules/registry-refactoring/src/main/resources/expcatalog-mysql.sql index c641bb6..3a316a2 100644 --- a/modules/registry-refactoring/src/main/resources/expcatalog-mysql.sql +++ b/modules/registry-refactoring/src/main/resources/expcatalog-mysql.sql @@ -237,6 +237,7 @@ CREATE TABLE PROCESS ( EXPERIMENT_DATA_DIR VARCHAR (512), USERNAME VARCHAR (255), GROUP_RESOURCE_PROFILE_ID VARCHAR (255) DEFAULT NULL, + USE_USER_CR_PREF BIT(1), PRIMARY KEY (PROCESS_ID), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE ); diff --git a/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessRepositoryTest.java b/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessRepositoryTest.java index fb6d7ca..1525515 100644 --- a/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessRepositoryTest.java +++ b/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessRepositoryTest.java @@ -99,11 +99,13 @@ public class ProcessRepositoryTest { assertTrue(experimentRepository.getExperiment(experimentId).getProcesses().size() == 1); processModel.setProcessDetail("detail"); + processModel.setUseUserCRPref(true); processRepository.updateProcess(processModel, processId); ProcessModel retrievedProcessModel = processRepository.getProcess(processId); assertEquals(experimentId, retrievedProcessModel.getExperimentId()); assertEquals("detail", retrievedProcessModel.getProcessDetail()); + assertTrue(retrievedProcessModel.isUseUserCRPref()); ComputationalResourceSchedulingModel computationalResourceSchedulingModel = new ComputationalResourceSchedulingModel(); assertEquals(processId, processRepository.addProcessResourceSchedule(computationalResourceSchedulingModel, processId)); -- To stop receiving notification emails like this one, please contact machristie@apache.org.