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/26 04:54:19 UTC
[16/51] [abbrv] incubator-nifi git commit: Merge branch 'develop' of
http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Merge branch 'develop' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/1c8d0057
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/1c8d0057
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/1c8d0057
Branch: refs/heads/NIFI-353
Commit: 1c8d0057a78ff848dab81f344d7a10cabd3a39b2
Parents: c0110aa bf97094
Author: Jenn Barnabee <je...@gmail.com>
Authored: Fri Feb 13 08:07:20 2015 -0500
Committer: Jenn Barnabee <je...@gmail.com>
Committed: Fri Feb 13 08:07:20 2015 -0500
----------------------------------------------------------------------
.gitignore | 7 +
README.md | 20 +-
nifi-nar-maven-plugin/README.md | 14 +
nifi-nar-maven-plugin/pom.xml | 10 +-
nifi-site/Gruntfile.js | 138 ++
nifi-site/LICENSE | 202 ++
nifi-site/README.md | 119 +
nifi-site/bower.json | 19 +
nifi-site/config.rb | 24 +
nifi-site/package.json | 24 +
nifi-site/robots.txt | 4 +
nifi-site/src/images/bgNifiLogo.png | Bin 0 -> 4232 bytes
nifi-site/src/images/egg-logo.png | Bin 0 -> 8626 bytes
nifi-site/src/images/feather-small.gif | Bin 0 -> 7129 bytes
nifi-site/src/images/flow.png | Bin 0 -> 503302 bytes
.../src/images/niFi-logo-horizontal-scaled.png | Bin 0 -> 4462 bytes
nifi-site/src/images/niFi-logo-horizontal.png | Bin 0 -> 13161 bytes
nifi-site/src/images/nifi16.ico | Bin 0 -> 1150 bytes
nifi-site/src/images/nifiDrop.svg | 217 ++
nifi-site/src/includes/disclaimer.hbs | 27 +
nifi-site/src/includes/footer.hbs | 6 +
nifi-site/src/includes/header.hbs | 22 +
nifi-site/src/includes/topbar.hbs | 71 +
nifi-site/src/js/app.js | 17 +
nifi-site/src/layouts/html.hbs | 3 +
nifi-site/src/layouts/markdown.hbs | 12 +
nifi-site/src/pages/html/developer-guide.hbs | 7 +
nifi-site/src/pages/html/download.hbs | 46 +
nifi-site/src/pages/html/faq.hbs | 33 +
nifi-site/src/pages/html/index.hbs | 210 ++
nifi-site/src/pages/html/mailing_lists.hbs | 70 +
nifi-site/src/pages/html/overview.hbs | 7 +
nifi-site/src/pages/html/people.hbs | 136 ++
nifi-site/src/pages/html/roadmap.hbs | 30 +
nifi-site/src/pages/html/screencasts.hbs | 50 +
nifi-site/src/pages/html/user-guide.hbs | 7 +
nifi-site/src/pages/markdown/quickstart.md | 101 +
nifi-site/src/pages/markdown/release-guide.md | 298 +++
nifi-site/src/scss/_settings.scss | 1465 ++++++++++++
nifi-site/src/scss/app.scss | 207 ++
nifi/LICENSE | 343 +--
nifi/NOTICE | 8 -
nifi/README.md | 40 +-
nifi/nifi-api/pom.xml | 4 +-
nifi/nifi-assembly/LICENSE | 803 +++++++
nifi/nifi-assembly/NOTICE | 529 +++++
nifi/nifi-assembly/README.md | 124 +
nifi/nifi-assembly/pom.xml | 13 +-
.../src/main/assembly/dependencies.xml | 6 +-
nifi/nifi-bootstrap/pom.xml | 2 +-
.../nifi-data-provenance-utils/pom.xml | 4 +-
.../nifi-expression-language/pom.xml | 4 +-
.../nifi-commons/nifi-flowfile-packager/pom.xml | 4 +-
nifi/nifi-commons/nifi-logging-utils/pom.xml | 4 +-
.../nifi-processor-utilities/pom.xml | 4 +-
nifi/nifi-commons/nifi-properties/pom.xml | 4 +-
nifi/nifi-commons/nifi-security-utils/pom.xml | 4 +-
nifi/nifi-commons/nifi-socket-utils/pom.xml | 4 +-
nifi/nifi-commons/nifi-utils/pom.xml | 4 +-
nifi/nifi-commons/nifi-web-utils/pom.xml | 4 +-
nifi/nifi-commons/nifi-write-ahead-log/pom.xml | 4 +-
nifi/nifi-commons/pom.xml | 5 +-
nifi/nifi-docs/LICENSE | 235 ++
nifi/nifi-docs/NOTICE | 5 +
nifi/nifi-docs/pom.xml | 36 +-
.../src/main/asciidoc/asciidoc-mod.css | 418 ++++
.../src/main/asciidoc/developer-guide.adoc | 2126 +++++++++++++++++-
.../src/main/assembly/dependencies.xml | 16 +
.../nifi-processor-bundle-archetype/pom.xml | 2 +-
.../src/main/java/MyProcessor.java | 10 +-
nifi/nifi-maven-archetypes/pom.xml | 2 +-
nifi/nifi-mock/pom.xml | 4 +-
.../nifi/util/StandardProcessorTestRunner.java | 7 +-
.../util/TestStandardProcessorTestRunner.java | 2 +
.../nifi-framework-nar/pom.xml | 4 +-
.../src/main/resources/META-INF/LICENSE | 264 +++
.../src/main/resources/META-INF/NOTICE | 131 ++
.../nifi-framework/nifi-administration/pom.xml | 4 +-
.../nifi-framework/nifi-client-dto/pom.xml | 2 +-
.../nifi-cluster-authorization-provider/pom.xml | 2 +-
.../nifi-cluster-protocol/pom.xml | 2 +-
.../nifi-framework/nifi-cluster-web/pom.xml | 2 +-
.../nifi-framework/nifi-cluster/pom.xml | 2 +-
.../nifi-file-authorization-provider/pom.xml | 4 +-
.../nifi-framework-core-api/pom.xml | 4 +-
.../nifi-framework/nifi-framework-core/pom.xml | 2 +-
.../nifi-framework/nifi-nar-utils/pom.xml | 2 +-
.../nifi-framework/nifi-resources/pom.xml | 2 +-
.../src/main/resources/conf/logback.xml | 4 +-
.../nifi-framework/nifi-runtime/pom.xml | 2 +-
.../nifi-framework/nifi-security/pom.xml | 4 +-
.../nifi-framework/nifi-site-to-site/pom.xml | 4 +-
.../nifi-framework/nifi-user-actions/pom.xml | 4 +-
.../nifi-web/nifi-custom-ui-utilities/pom.xml | 2 +-
.../nifi-framework/nifi-web/nifi-jetty/pom.xml | 2 +-
.../nifi-web/nifi-web-api/pom.xml | 6 +-
.../nifi/web/controller/ControllerFacade.java | 15 +-
.../src/main/resources/META-INF/NOTICE | 27 +
.../nifi-web/nifi-web-docs/pom.xml | 2 +-
.../src/main/resources/META-INF/NOTICE | 19 +
.../nifi-web/nifi-web-error/pom.xml | 2 +-
.../nifi-web-optimistic-locking/pom.xml | 2 +-
.../nifi-web/nifi-web-security/pom.xml | 2 +-
.../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 16 +-
.../org/apache/nifi/web/servlet/ConvertSvg.java | 117 -
.../apache/nifi/web/servlet/DownloadSvg.java | 89 +
.../src/main/resources/META-INF/LICENSE | 434 ++++
.../nifi-web-ui/src/main/webapp/WEB-INF/web.xml | 30 +-
.../src/main/webapp/css/provenance.css | 5 +
.../src/main/webapp/js/nf/canvas/nf-actions.js | 2 -
.../webapp/js/nf/canvas/nf-canvas-toolbox.js | 58 +-
.../main/webapp/js/nf/canvas/nf-canvas-utils.js | 19 +-
.../src/main/webapp/js/nf/canvas/nf-canvas.js | 25 +-
.../main/webapp/js/nf/canvas/nf-connectable.js | 111 +-
.../src/main/webapp/js/nf/canvas/nf-graph.js | 6 +-
.../webapp/js/nf/canvas/nf-process-group.js | 6 +-
.../nf-remote-process-group-configuration.js | 3 +
.../js/nf/canvas/nf-remote-process-group.js | 2 +-
.../webapp/js/nf/cluster/nf-cluster-table.js | 319 ++-
.../webapp/js/nf/counters/nf-counters-table.js | 63 +-
.../webapp/js/nf/history/nf-history-table.js | 147 +-
.../src/main/webapp/js/nf/nf-common.js | 8 +-
.../js/nf/provenance/nf-provenance-lineage.js | 17 +-
.../js/nf/provenance/nf-provenance-table.js | 103 +-
.../webapp/js/nf/summary/nf-summary-table.js | 523 ++---
.../src/main/webapp/js/nf/summary/nf-summary.js | 6 -
.../js/nf/templates/nf-templates-table.js | 73 +-
.../main/webapp/js/nf/users/nf-users-table.js | 440 ++--
.../nifi-framework/nifi-web/pom.xml | 10 +-
.../nifi-framework/pom.xml | 4 +-
.../nifi-framework-bundle/pom.xml | 36 +-
.../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml | 4 +-
.../src/main/resources/META-INF/NOTICE | 35 +
.../nifi-hdfs-processors/pom.xml | 2 +-
.../nifi-nar-bundles/nifi-hadoop-bundle/pom.xml | 6 +-
.../nifi-hadoop-libraries-nar/pom.xml | 4 +-
.../src/main/resources/META-INF/LICENSE | 359 +++
.../src/main/resources/META-INF/NOTICE | 237 ++
.../nifi-hadoop-libraries-bundle/pom.xml | 4 +-
nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml | 4 +-
.../src/main/resources/META-INF/NOTICE | 37 +
.../nifi-kafka-bundle/nifi-kafka-nar/pom.xml | 4 +-
.../src/main/resources/META-INF/LICENSE | 299 +++
.../src/main/resources/META-INF/NOTICE | 72 +
.../nifi-kafka-processors/pom.xml | 2 +-
nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml | 4 +-
.../pom.xml | 2 +-
.../nifi-provenance-repository-nar/pom.xml | 4 +-
.../src/main/resources/META-INF/NOTICE | 202 ++
.../nifi-volatile-provenance-repository/pom.xml | 2 +-
.../nifi-provenance-repository-bundle/pom.xml | 8 +-
.../nifi-standard-nar/pom.xml | 4 +-
.../src/main/resources/META-INF/LICENSE | 292 +++
.../src/main/resources/META-INF/NOTICE | 119 +
.../nifi-standard-prioritizers/pom.xml | 2 +-
.../nifi-standard-processors/pom.xml | 2 +-
.../nifi/processors/standard/BinFiles.java | 351 +++
.../apache/nifi/processors/standard/GetFTP.java | 5 +
.../nifi/processors/standard/JmsConsumer.java | 143 +-
.../nifi/processors/standard/MergeContent.java | 403 +---
.../nifi/processors/standard/PostHTTP.java | 30 +-
.../apache/nifi/processors/standard/PutFTP.java | 7 +-
.../apache/nifi/processors/standard/PutJMS.java | 11 +-
.../processors/standard/util/FTPTransfer.java | 48 +-
.../standard/util/JmsProcessingSummary.java | 83 +
.../processors/standard/util/JmsProperties.java | 3 +-
.../standard/util/SocksProxySocketFactory.java | 69 +
.../processors/standard/CaptureServlet.java | 54 +
.../processors/standard/TestJmsConsumer.java | 173 ++
.../nifi/processors/standard/TestPostHTTP.java | 249 ++
.../nifi/processors/standard/TestServer.java | 27 +-
.../nifi-standard-reporting-tasks/pom.xml | 2 +-
.../nifi-standard-bundle/pom.xml | 10 +-
.../pom.xml | 2 +-
.../pom.xml | 2 +-
.../nifi-distributed-cache-protocol/pom.xml | 2 +-
.../nifi-distributed-cache-server/pom.xml | 2 +-
.../nifi-distributed-cache-services-nar/pom.xml | 4 +-
.../src/main/resources/META-INF/NOTICE | 19 +
.../pom.xml | 4 +-
.../nifi-load-distribution-service-api/pom.xml | 4 +-
.../nifi-ssl-context-nar/pom.xml | 4 +-
.../src/main/resources/META-INF/NOTICE | 19 +
.../nifi-ssl-context-service/pom.xml | 2 +-
.../nifi-ssl-context-bundle/pom.xml | 4 +-
.../nifi-ssl-context-service-api/pom.xml | 2 +-
.../nifi-standard-services-api-nar/pom.xml | 4 +-
.../nifi-standard-services/pom.xml | 4 +-
.../nifi-update-attribute-model/pom.xml | 2 +-
.../nifi-update-attribute-nar/pom.xml | 4 +-
.../src/main/resources/META-INF/NOTICE | 19 +
.../nifi-update-attribute-processor/pom.xml | 2 +-
.../nifi-update-attribute-ui/pom.xml | 2 +-
.../update/attributes/api/RuleResource.java | 16 +-
.../src/main/resources/META-INF/LICENSE | 238 ++
.../src/main/resources/META-INF/NOTICE | 49 +
.../nifi-update-attribute-bundle/pom.xml | 10 +-
nifi/nifi-nar-bundles/pom.xml | 31 +-
nifi/pom.xml | 90 +-
199 files changed, 13447 insertions(+), 2075 deletions(-)
----------------------------------------------------------------------