Merge branch 'develop' into NIFI-632
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/28bfb70e Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/28bfb70e Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/28bfb70e Branch: refs/heads/NIFI-680 Commit: 28bfb70e46a3099139e810b5ee93d7335ddb880c Parents: 46aa268 33848b3 Author: danbress <dbr...@onyxconsults.com> Authored: Sun Jun 21 13:21:55 2015 -0400 Committer: danbress <dbr...@onyxconsults.com> Committed: Sun Jun 21 13:21:55 2015 -0400 ---------------------------------------------------------------------- nifi-site/src/pages/html/people.hbs | 5 + .../src/main/assembly/dependencies.xml | 2 + nifi/nifi-bootstrap/pom.xml | 7 + .../org/apache/nifi/bootstrap/NiFiListener.java | 13 +- .../java/org/apache/nifi/bootstrap/RunNiFi.java | 395 +++++++------ .../org/apache/nifi/bootstrap/ShutdownHook.java | 6 +- .../nifi/processor/util/SSLProperties.java | 10 +- .../apache/nifi/util/NiFiPropertiesTest.java | 13 +- .../nifi/security/util/SslContextFactory.java | 15 +- .../apache/nifi/util/MockProcessSession.java | 40 +- .../nifi/util/MockProvenanceReporter.java | 365 ++++++++++-- .../apache/nifi/util/MockSessionFactory.java | 8 +- .../apache/nifi/util/SharedSessionState.java | 26 +- .../nifi/util/StandardProcessorTestRunner.java | 34 +- .../java/org/apache/nifi/util/TestRunner.java | 15 + .../nifi/controller/StandardFlowFileQueue.java | 18 +- .../repository/StandardProcessSession.java | 27 +- .../repository/StandardProvenanceReporter.java | 32 +- .../repository/VolatileContentRepository.java | 44 +- .../nifi/groups/StandardProcessGroup.java | 6 +- .../TestStandardProvenanceReporter.java | 7 +- .../org/apache/nifi/nar/NarUnpackerTest.java | 14 +- .../src/main/resources/bin/dump-nifi.bat | 4 +- .../src/main/resources/bin/nifi.sh | 21 +- .../src/main/resources/bin/run-nifi.bat | 4 +- .../src/main/resources/bin/start-nifi.bat | 47 -- .../src/main/resources/bin/stop-nifi.bat | 47 -- .../src/main/resources/conf/logback.xml | 48 ++ .../nifi/remote/StandardRootGroupPort.java | 8 +- .../nifi/web/StandardNiFiContentAccess.java | 2 +- .../nifi/web/StandardNiFiServiceFacade.java | 8 +- .../apache/nifi/web/api/ProvenanceResource.java | 4 +- .../apache/nifi/web/api/TemplateResource.java | 2 +- .../org/apache/nifi/web/api/dto/DtoFactory.java | 5 + .../nifi/web/dao/impl/StandardSnippetDAO.java | 2 +- .../org/apache/nifi/web/util/SnippetUtils.java | 15 +- .../nifi/web/ContentViewerController.java | 3 + .../apache/nifi/web/servlet/DownloadSvg.java | 2 +- .../canvas/controller-service-configuration.jsp | 4 - .../src/main/webapp/css/controller-service.css | 13 - .../src/main/webapp/images/iconMoveToParent.png | Bin 0 -> 215 bytes .../src/main/webapp/js/nf/canvas/nf-actions.js | 15 + .../main/webapp/js/nf/canvas/nf-canvas-utils.js | 126 +++-- .../main/webapp/js/nf/canvas/nf-context-menu.js | 12 +- .../js/nf/canvas/nf-controller-service.js | 20 - .../nifi/processors/kafka/TestPutKafka.java | 52 +- .../nifi-standard-content-viewer/pom.xml | 5 +- .../web/StandardContentViewerController.java | 4 +- .../prioritizer/NewestFirstPrioritizerTest.java | 16 +- .../prioritizer/OldestFirstPrioritizerTest.java | 16 +- .../PriorityAttributePrioritizerTest.java | 27 +- .../nifi-standard-processors/pom.xml | 552 ++++++++++--------- .../nifi/processors/standard/EvaluateXPath.java | 2 +- .../nifi/processors/standard/ExecuteSQL.java | 157 ++++++ .../processors/standard/util/JdbcCommon.java | 165 ++++++ .../org.apache.nifi.processor.Processor | 1 + .../processors/standard/TestExecuteSQL.java | 169 ++++++ .../standard/util/TestJdbcCommon.java | 155 ++++++ .../standard/util/TestJdbcHugeStream.java | 267 +++++++++ .../nifi-standard-bundle/pom.xml | 7 +- .../apache/nifi/dbcp/DBCPConnectionPool.java | 181 +++--- .../nifi/dbcp/DatabaseSystemDescriptor.java | 1 + .../org/apache/nifi/dbcp/DatabaseSystems.java | 1 + .../org/apache/nifi/dbcp/DBCPServiceTest.java | 160 ++---- .../cache/server/AbstractCacheServer.java | 8 +- .../distributed/cache/server/CacheServer.java | 2 + .../cache/server/DistributedCacheServer.java | 65 ++- .../cache/server/TestServerAndClient.java | 292 +++++----- .../nifi/ssl/StandardSSLContextService.java | 91 ++- .../org/apache/nifi/ssl/SSLContextService.java | 1 + nifi/pom.xml | 10 + 71 files changed, 2650 insertions(+), 1271 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/28bfb70e/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/VolatileContentRepository.java ----------------------------------------------------------------------
