Return-Path: X-Original-To: apmail-syncope-commits-archive@www.apache.org Delivered-To: apmail-syncope-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 44AEC1082D for ; Mon, 12 Jan 2015 13:50:04 +0000 (UTC) Received: (qmail 67999 invoked by uid 500); 12 Jan 2015 13:50:05 -0000 Delivered-To: apmail-syncope-commits-archive@syncope.apache.org Received: (qmail 67946 invoked by uid 500); 12 Jan 2015 13:50:05 -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 67930 invoked by uid 99); 12 Jan 2015 13:50:05 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Jan 2015 13:50:05 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 913E29ABD80; Mon, 12 Jan 2015 13:50:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ilgrosso@apache.org To: commits@syncope.apache.org Date: Mon, 12 Jan 2015 13:50:06 -0000 Message-Id: In-Reply-To: <70bf88af42b54de7b191f0f375164b9e@git.apache.org> References: <70bf88af42b54de7b191f0f375164b9e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [02/11] syncope git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/syncope Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/syncope Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/184b89f8 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/184b89f8 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/184b89f8 Branch: refs/heads/2_0_X Commit: 184b89f8d84095f51b5d48292fbd70350a3a8ec1 Parents: 061a601 a8f98d2 Author: giacomolm Authored: Thu Jan 8 10:53:51 2015 +0100 Committer: giacomolm Committed: Thu Jan 8 10:53:51 2015 +0100 ---------------------------------------------------------------------- .../org/apache/syncope/common/to/RouteTO.java | 15 ++- .../DefaultRoleProvisioningManager.java | 30 +++--- .../DefaultUserProvisioningManager.java | 102 +++++++------------ .../core/provisioning/ProvisioningManager.java | 12 +-- .../provisioning/RoleProvisioningManager.java | 34 ++++--- .../provisioning/UserProvisioningManager.java | 52 +++++----- .../camel/CamelRoleProvisioningManager.java | 2 +- .../camel/CamelUserProvisioningManager.java | 2 +- .../core/sync/impl/RoleSyncResultHandler.java | 2 +- .../core/sync/impl/UserSyncResultHandler.java | 2 +- pom.xml | 2 +- 11 files changed, 114 insertions(+), 141 deletions(-) ----------------------------------------------------------------------