Merge remote-tracking branch 'upstream/develop' into nifi-solr-bundle
Conflicts:
nifi/nifi-assembly/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/4107a0e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/4107a0e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/4107a0e9
Branch: refs/heads/develop
Commit: 4107a0e93492037c39333ef082da22725ce500cb
Parents: 71b6ffc a7b826a
Author: bbende <[email protected]>
Authored: Mon Mar 23 19:46:14 2015 -0400
Committer: bbende <[email protected]>
Committed: Mon Mar 23 19:46:14 2015 -0400
----------------------------------------------------------------------
.../AbstractConfigurableComponent.java | 5 +-
.../nifi/components/ValidationContext.java | 19 ++
.../org/apache/nifi/web/ViewableContent.java | 74 +++++
nifi/nifi-assembly/pom.xml | 3 +-
.../nifi/processor/util/StandardValidators.java | 86 +++++-
.../processor/util/TestStandardValidators.java | 34 ++-
.../META-INF/maven/archetype-metadata.xml | 2 +-
.../src/main/java/MyProcessor.java | 8 +
.../docs/__package__.MyProcessor/index.html | 96 -------
.../apache/nifi/util/MockValidationContext.java | 27 ++
.../nifi/util/StandardProcessorTestRunner.java | 4 +-
.../html/HtmlDocumentationWriter.java | 34 ++-
.../html/HtmlProcessorDocumentationWriter.java | 4 +
.../repository/FileSystemRepository.java | 78 ++---
.../processor/StandardValidationContext.java | 25 +-
.../nifi/remote/StandardRootGroupPort.java | 11 +-
.../nifi-framework/nifi-web/nifi-jetty/pom.xml | 10 +
.../org/apache/nifi/web/server/JettyServer.java | 108 +++++--
.../nifi-web/nifi-web-api/pom.xml | 5 +
.../org/apache/nifi/web/NiFiServiceFacade.java | 1 -
.../nifi/web/StandardNiFiContentAccess.java | 141 +++++++++
.../nifi/web/StandardNiFiServiceFacade.java | 3 -
.../apache/nifi/web/StandardNiFiWebContext.java | 2 +-
.../apache/nifi/web/api/ProvenanceResource.java | 2 +-
.../nifi/web/controller/ControllerFacade.java | 2 +-
.../nifi/web/util/DownloadableContent.java | 47 ---
.../src/main/resources/nifi-web-api-context.xml | 7 +
.../nifi-web/nifi-web-content-access/pom.xml | 25 ++
.../java/org/apache/nifi/web/ContentAccess.java | 33 +++
.../apache/nifi/web/ContentRequestContext.java | 51 ++++
.../apache/nifi/web/DownloadableContent.java | 62 ++++
.../nifi-web/nifi-web-content-viewer/.gitignore | 1 +
.../nifi-web/nifi-web-content-viewer/pom.xml | 91 ++++++
.../nifi/web/ContentViewerController.java | 284 +++++++++++++++++++
.../src/main/resources/META-INF/NOTICE | 19 ++
.../src/main/webapp/WEB-INF/jsp/footer.jsp | 20 ++
.../src/main/webapp/WEB-INF/jsp/header.jsp | 92 ++++++
.../src/main/webapp/WEB-INF/jsp/hexview.jsp | 32 +++
.../src/main/webapp/WEB-INF/jsp/no-viewer.jsp | 20 ++
.../src/main/webapp/WEB-INF/web.xml | 26 ++
.../src/main/webapp/css/main.css | 113 ++++++++
.../src/main/webapp/js/hexview/LICENSE | 32 +++
.../main/webapp/js/hexview/hexview.default.css | 10 +
.../src/main/webapp/js/hexview/hexview.js | 199 +++++++++++++
.../src/main/webapp/css/component-usage.css | 4 +
.../nifi-web-ui/src/main/webapp/WEB-INF/web.xml | 11 +
.../js/codemirror/addon/fold/foldgutter.css | 20 ++
.../js/codemirror/lib/codemirror-compressed.js | 14 +-
.../webapp/js/jquery/combo/jquery.combo.css | 8 +
.../nifi-framework/nifi-web/pom.xml | 8 +
.../nifi-framework-bundle/pom.xml | 5 +
.../processors/kite/AbstractKiteProcessor.java | 43 +--
.../nifi/processors/kite/ConvertCSVToAvro.java | 4 +-
.../nifi/processors/kite/ConvertJSONToAvro.java | 3 +-
.../processors/kite/StoreInKiteDataset.java | 3 +-
.../nifi-standard-content-viewer/pom.xml | 71 +++++
.../web/StandardContentViewerController.java | 103 +++++++
.../src/main/resources/META-INF/NOTICE | 19 ++
.../main/webapp/META-INF/nifi-content-viewer | 3 +
.../src/main/webapp/WEB-INF/jsp/codemirror.jsp | 47 +++
.../src/main/webapp/WEB-INF/web.xml | 29 ++
.../src/main/webapp/css/main.css | 20 ++
.../nifi-standard-nar/pom.xml | 5 +
.../nifi/processors/standard/ControlRate.java | 2 +-
.../processors/standard/EvaluateJsonPath.java | 28 +-
.../processors/standard/HandleHttpResponse.java | 2 +-
.../nifi/processors/standard/InvokeHTTP.java | 2 +-
.../nifi/processors/standard/PostHTTP.java | 1 +
.../nifi/processors/standard/PutEmail.java | 149 ++++++++--
.../nifi/processors/standard/TestPutEmail.java | 40 ++-
.../nifi-standard-bundle/pom.xml | 10 +-
71 files changed, 2287 insertions(+), 315 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4107a0e9/nifi/nifi-assembly/pom.xml
----------------------------------------------------------------------
