Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C2939200CB0 for ; Fri, 23 Jun 2017 10:56:42 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id BF695160BD4; Fri, 23 Jun 2017 08:56:42 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 11CBA160BCA for ; Fri, 23 Jun 2017 10:56:41 +0200 (CEST) Received: (qmail 1970 invoked by uid 500); 23 Jun 2017 08:56:41 -0000 Mailing-List: contact commits-help@syncope.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@syncope.apache.org Delivered-To: mailing list commits@syncope.apache.org Received: (qmail 1960 invoked by uid 99); 23 Jun 2017 08:56:41 -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; Fri, 23 Jun 2017 08:56:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2B31EDFA6C; Fri, 23 Jun 2017 08:56:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: ilgrosso@apache.org To: commits@syncope.apache.org Date: Fri, 23 Jun 2017 08:56:41 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] syncope git commit: Ensuring Oracle DB works archived-at: Fri, 23 Jun 2017 08:56:42 -0000 Repository: syncope Updated Branches: refs/heads/2_0_X d501f3551 -> 0458223c3 refs/heads/master 0dc6593ff -> 017909743 Ensuring Oracle DB works Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/0458223c Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/0458223c Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/0458223c Branch: refs/heads/2_0_X Commit: 0458223c3cd309ceb3ca2f01ccfcadb12b7c9834 Parents: d501f35 Author: Francesco Chicchiriccò Authored: Fri Jun 23 10:55:58 2017 +0200 Committer: Francesco Chicchiriccò Committed: Fri Jun 23 10:55:58 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/syncope/core/logic/DynRealmLogic.java | 4 ++-- core/persistence-jpa/src/main/resources/views.xml | 4 ++-- fit/core-reference/pom.xml | 10 +++++----- .../src/main/resources/oracle/domains/Master.properties | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/0458223c/core/logic/src/main/java/org/apache/syncope/core/logic/DynRealmLogic.java ---------------------------------------------------------------------- diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/DynRealmLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/DynRealmLogic.java index bed7028..c0ab811 100644 --- a/core/logic/src/main/java/org/apache/syncope/core/logic/DynRealmLogic.java +++ b/core/logic/src/main/java/org/apache/syncope/core/logic/DynRealmLogic.java @@ -68,7 +68,7 @@ public class DynRealmLogic extends AbstractTransactionalLogic { @PreAuthorize("hasRole('" + StandardEntitlement.DYNREALM_CREATE + "')") public DynRealmTO create(final DynRealmTO dynRealmTO) { - return binder.getDynRealmTO(dynRealmDAO.save(binder.create(dynRealmTO))); + return binder.getDynRealmTO(binder.create(dynRealmTO)); } @PreAuthorize("hasRole('" + StandardEntitlement.DYNREALM_UPDATE + "')") @@ -79,7 +79,7 @@ public class DynRealmLogic extends AbstractTransactionalLogic { throw new NotFoundException(dynRealmTO.getKey()); } - return binder.getDynRealmTO(dynRealmDAO.save(binder.update(dynRealm, dynRealmTO))); + return binder.getDynRealmTO(binder.update(dynRealm, dynRealmTO)); } @PreAuthorize("hasRole('" + StandardEntitlement.DYNREALM_DELETE + "')") http://git-wip-us.apache.org/repos/asf/syncope/blob/0458223c/core/persistence-jpa/src/main/resources/views.xml ---------------------------------------------------------------------- diff --git a/core/persistence-jpa/src/main/resources/views.xml b/core/persistence-jpa/src/main/resources/views.xml index bcff6b9..88b4bb8 100644 --- a/core/persistence-jpa/src/main/resources/views.xml +++ b/core/persistence-jpa/src/main/resources/views.xml @@ -36,13 +36,13 @@ under the License. CREATE TABLE DynRoleMembers( any_id CHAR(36), - role_id CHAR(36), + role_id VARCHAR(255), UNIQUE(any_id, role_id)) CREATE TABLE DynRealmMembers( any_id CHAR(36), - dynRealm_id CHAR(36), + dynRealm_id VARCHAR(255), UNIQUE(any_id, dynRealm_id)) http://git-wip-us.apache.org/repos/asf/syncope/blob/0458223c/fit/core-reference/pom.xml ---------------------------------------------------------------------- diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml index 3040b95..ea247ce 100644 --- a/fit/core-reference/pom.xml +++ b/fit/core-reference/pom.xml @@ -591,15 +591,15 @@ under the License. oracle-it - com.oracle - ojdbc6 + com.oracle.jdbc + ojdbc8 - com.oracle - ojdbc6 - 11.2.0.4 + com.oracle.jdbc + ojdbc8 + 12.2.0.1 test http://git-wip-us.apache.org/repos/asf/syncope/blob/0458223c/fit/core-reference/src/main/resources/oracle/domains/Master.properties ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/main/resources/oracle/domains/Master.properties b/fit/core-reference/src/main/resources/oracle/domains/Master.properties index 13c3c9f..f4ce757 100644 --- a/fit/core-reference/src/main/resources/oracle/domains/Master.properties +++ b/fit/core-reference/src/main/resources/oracle/domains/Master.properties @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. Master.driverClassName=oracle.jdbc.OracleDriver -Master.url=jdbc:oracle:thin:@pioppo:1521:orcl +Master.url=jdbc:oracle:thin:@localhost:1521:XE Master.schema=SYNCOPE Master.username=syncope Master.password=syncope