You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2014/12/01 13:54:09 UTC

[5/5] syncope git commit: Merge branch '1_2_X'

Merge branch '1_2_X'


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/3080e978
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/3080e978
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/3080e978

Branch: refs/heads/master
Commit: 3080e978f309884e78bbe3acf388319910deb6fc
Parents: ac606b3 2c04c8e
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Dec 1 13:53:49 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Dec 1 13:53:49 2014 +0100

----------------------------------------------------------------------
 .../core/rest/controller/RoleController.java    |  3 +-
 .../rest/controller/UserWorkflowController.java |  6 ++--
 .../syncope/core/rest/data/UserDataBinder.java  |  3 +-
 .../core/util/VelocityEngineFactoryBean.java    | 30 +++++++++--------
 .../syncope/core/workflow/WorkflowAdapter.java  |  6 ++--
 .../workflow/role/NoOpRoleWorkflowAdapter.java  |  4 +--
 .../workflow/user/NoOpUserWorkflowAdapter.java  |  4 +--
 .../activiti/ActivitiUserWorkflowAdapter.java   | 35 ++++++++++----------
 8 files changed, 45 insertions(+), 46 deletions(-)
----------------------------------------------------------------------