You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2015/02/02 15:25:03 UTC
[4/6] incubator-nifi git commit: Merge branch 'NIFI-250' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250

Merge branch 'NIFI-250' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250


Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/0cb1adbc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/0cb1adbc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/0cb1adbc

Branch: refs/heads/NIFI-250
Commit: 0cb1adbc1f1bf0272be813bf58b90444243b65b5
Parents: d1caa7e cc25d1d
Author: Matt Gilman <ma...@gmail.com>
Authored: Mon Feb 2 07:52:38 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Mon Feb 2 07:52:38 2015 -0500

----------------------------------------------------------------------
 .../nifi/cluster/flow/ClusterDataFlow.java      |  15 +-
 .../cluster/flow/DataFlowManagementService.java |  17 ++
 .../nifi/cluster/flow/impl/DataFlowDaoImpl.java |  16 +-
 .../impl/DataFlowManagementServiceImpl.java     |  65 +++++-
 .../cluster/manager/impl/WebClusterManager.java | 217 +++++++++++++++----
 .../spring/WebClusterManagerFactoryBean.java    |   6 -
 .../reporting/ClusteredReportingTaskNode.java   |   3 +-
 .../apache/nifi/controller/Availability.java    |  12 +-
 .../nifi/controller/ReportingTaskNode.java      |   2 -
 .../service/ControllerServiceNode.java          |   2 -
 .../service/ControllerServiceProvider.java      |  16 +-
 .../apache/nifi/controller/FlowController.java  |  65 ++----
 .../nifi/controller/StandardFlowSerializer.java |  20 +-
 .../nifi/controller/StandardFlowService.java    |   4 +-
 .../controller/StandardFlowSynchronizer.java    |  54 ++++-
 .../reporting/AbstractReportingTaskNode.java    |  12 +-
 .../reporting/StandardReportingTaskNode.java    |   3 +-
 .../service/ControllerServiceLoader.java        |  86 +++-----
 .../service/StandardControllerServiceNode.java  |  12 +-
 .../StandardControllerServiceProvider.java      |  11 +-
 .../nifi/persistence/FlowConfigurationDAO.java  |  12 -
 .../StandardXMLFlowConfigurationDAO.java        |  11 +-
 .../nifi/web/controller/ControllerFacade.java   |   9 +-
 .../dao/impl/StandardControllerServiceDAO.java  |   6 +-
 .../nifi/processors/standard/PostHTTP.java      |  38 ++--
 .../DistributedMapCacheClientService.java       |  18 +-
 .../DistributedSetCacheClientService.java       |  11 +-
 .../cache/server/DistributedCacheServer.java    |   9 +-
 .../nifi/ssl/StandardSSLContextService.java     |   2 -
 29 files changed, 475 insertions(+), 279 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/0cb1adbc/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardControllerServiceDAO.java
----------------------------------------------------------------------