syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [11/11] syncope git commit: Merge branch 'master' into 2_0_X
Date Mon, 12 Jan 2015 13:50:15 GMT
Merge branch 'master' into 2_0_X


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

Branch: refs/heads/2_0_X
Commit: 2a1912638777f9478d2f2693ff23289e2670063a
Parents: 99369c3 6c4b559
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
Authored: Mon Jan 12 14:49:37 2015 +0100
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Mon Jan 12 14:49:37 2015 +0100

----------------------------------------------------------------------
 .../syncope/common/services/RouteService.java   |  31 +-
 .../common/services/WorkflowService.java        |   8 -
 .../org/apache/syncope/common/to/RouteTO.java   |  11 +
 .../syncope/console/pages/Configuration.java    |  12 +-
 .../syncope/console/pages/RouteModalPage.java   |   4 +-
 .../syncope/console/rest/RouteRestClient.java   |  14 +-
 .../syncope/core/init/CamelRouteLoader.java     |  94 ++--
 .../core/persistence/beans/CamelRoute.java      |  18 +-
 .../syncope/core/persistence/dao/RouteDAO.java  |   9 +-
 .../core/persistence/dao/impl/RouteDAOImpl.java |  21 +-
 .../camel/CamelRoleProvisioningManager.java     |   2 +-
 .../camel/CamelUserProvisioningManager.java     |   5 +-
 .../provisioning/camel/SyncopeCamelContext.java |  14 +-
 .../core/rest/controller/RouteController.java   |  16 +-
 .../syncope/core/services/RouteServiceImpl.java |  22 +-
 .../core/services/WorkflowServiceImpl.java      |   9 -
 core/src/main/resources/camelRoute.xml          | 468 -------------------
 core/src/main/resources/roleRoute.xml           |   2 -
 core/src/main/resources/userRoute.xml           |  64 ++-
 pom.xml                                         |   6 +-
 20 files changed, 249 insertions(+), 581 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/2a191263/pom.xml
----------------------------------------------------------------------


Mime
View raw message