Merge branch 'develop' into annotations
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/61e743ff Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/61e743ff Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/61e743ff Branch: refs/heads/NIFI-250 Commit: 61e743ff1d106c53dbba47b3ad0f03cae8f04025 Parents: d0e15f1 33cee9d Author: Mark Payne <[email protected]> Authored: Mon Jan 26 08:30:53 2015 -0500 Committer: Mark Payne <[email protected]> Committed: Mon Jan 26 08:30:53 2015 -0500 ---------------------------------------------------------------------- nifi-nar-maven-plugin/pom.xml | 5 +- .../src/main/asciidoc/administration-guide.adoc | 307 +++++++++++++++++++ .../nifi-processor-bundle-archetype/pom.xml | 49 +++ .../META-INF/maven/archetype-metadata.xml | 43 +++ .../nifi-__artifactBaseName__-nar/pom.xml | 37 +++ .../pom.xml | 54 ++++ .../src/main/java/MyProcessor.java | 88 ++++++ .../org.apache.nifi.processor.Processor | 15 + .../docs/__package__.MyProcessor/index.html | 96 ++++++ .../src/test/java/MyProcessorTest.java | 39 +++ .../main/resources/archetype-resources/pom.xml | 35 +++ nifi/nifi-maven-archetypes/pom.xml | 30 ++ .../nifi/web/controller/ControllerFacade.java | 12 +- .../nf-processor-property-combo-editor.js | 4 +- .../nifi/processors/standard/PostHTTP.java | 34 +- .../index.html | 20 ++ .../index.html | 21 ++ nifi/pom.xml | 6 +- 18 files changed, 875 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/61e743ff/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/61e743ff/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java ----------------------------------------------------------------------
