Merge branch 'NIFI-280-take2-tworow' of https://github.com/danbress/incubator-nifi into NIFI-280-P19 This closes #19
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/cadfc679 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/cadfc679 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/cadfc679 Branch: refs/heads/NIFI-353 Commit: cadfc679d80034c10ac60e2bc4dc23b1979cdffe Parents: 1cca300 7485716 Author: joewitt <[email protected]> Authored: Tue Mar 17 13:58:00 2015 -0400 Committer: joewitt <[email protected]> Committed: Tue Mar 17 13:58:00 2015 -0400 ---------------------------------------------------------------------- .../nifi-framework/nifi-documentation/pom.xml | 49 +++ .../ConfigurableComponentInitializer.java | 38 ++ .../apache/nifi/documentation/DocGenerator.java | 182 ++++++++ .../nifi/documentation/DocumentationWriter.java | 33 ++ .../html/HtmlDocumentationWriter.java | 417 +++++++++++++++++++ .../html/HtmlProcessorDocumentationWriter.java | 58 +++ .../init/ControllerServiceInitializer.java | 38 ++ .../init/ProcessorInitializer.java | 37 ++ .../init/ReportingTaskingInitializer.java | 37 ++ ...kControllerServiceInitializationContext.java | 40 ++ .../mock/MockControllerServiceLookup.java | 55 +++ .../MockProcessorInitializationContext.java | 45 ++ .../MockReportingInitializationContext.java | 63 +++ .../FullyDocumentedControllerService.java | 57 +++ .../example/FullyDocumentedProcessor.java | 110 +++++ .../example/FullyDocumentedReportingTask.java | 50 +++ .../documentation/example/NakedProcessor.java | 16 + .../documentation/example/SampleService.java | 25 ++ .../html/HtmlDocumentationWriterTest.java | 93 +++++ .../html/ProcessorDocumentationWriterTest.java | 103 +++++ .../nifi/documentation/html/XmlValidator.java | 50 +++ .../nifi-framework/nifi-runtime/pom.xml | 5 + .../src/main/java/org/apache/nifi/NiFi.java | 3 + .../src/main/webapp/css/component-usage.css | 94 ++++- .../nifi-framework/pom.xml | 1 + .../nifi-framework-bundle/pom.xml | 5 + .../additionalDetails.html | 53 +++ .../index.html | 88 ---- .../additionalDetails.html | 57 +++ .../index.html | 162 ------- .../additionalDetails.html | 32 ++ .../index.html | 150 ------- .../additionalDetails.html | 51 +++ .../index.html | 159 ------- .../additionalDetails.html | 78 ++++ .../index.html | 173 -------- .../additionalDetails.html | 45 ++ .../index.html | 189 --------- .../index.html | 63 --- .../additionalDetails.html | 68 +++ .../index.html | 166 -------- .../index.html | 116 ------ .../index.html | 65 --- .../additionalDetails.html | 58 +++ .../index.html | 147 ------- .../additionalDetails.html | 60 +++ .../index.html | 106 ----- .../index.html | 97 ----- .../index.html | 160 ------- .../additionalDetails.html | 34 ++ .../index.html | 135 ------ .../additionalDetails.html | 161 +++++++ .../index.html | 311 -------------- .../additionalDetails.html | 57 +++ .../index.html | 111 ----- .../index.html | 64 --- .../additionalDetails.html | 74 ++++ .../index.html | 227 ---------- .../additionalDetails.html | 79 ++++ .../index.html | 186 --------- .../additionalDetails.html | 45 ++ .../index.html | 143 ------- .../index.html | 118 ------ .../index.html | 122 ------ .../additionalDetails.html | 80 ++++ .../index.html | 250 ----------- .../additionalDetails.html | 35 ++ .../index.html | 88 ---- .../additionalDetails.html | 35 ++ .../index.html | 89 ---- .../additionalDetails.html | 98 +++++ .../index.html | 136 ------ .../additionalDetails.html | 64 +++ .../index.html | 181 -------- .../index.html | 86 ---- .../index.html | 144 ------- .../index.html | 80 ---- .../additionalDetails.html | 115 +++++ .../index.html | 347 --------------- .../index.html | 64 --- .../additionalDetails.html | 49 +++ .../index.html | 143 ------- .../additionalDetails.html | 48 +++ .../index.html | 187 --------- .../index.html | 114 ----- .../additionalDetails.html | 66 +++ .../index.html | 283 ------------- .../index.html | 109 ----- .../index.html | 152 ------- .../additionalDetails.html | 34 ++ .../index.html | 281 ------------- .../index.html | 91 ---- .../index.html | 114 ----- .../additionalDetails.html | 46 ++ .../index.html | 110 ----- .../index.html | 82 ---- .../index.html | 85 ---- .../additionalDetails.html | 45 ++ .../index.html | 100 ----- .../additionalDetails.html | 82 ++++ .../index.html | 123 ------ .../additionalDetails.html | 67 +++ .../index.html | 107 ----- .../additionalDetails.html | 72 ++++ .../index.html | 121 ------ .../index.html | 64 --- .../index.html | 63 --- .../additionalDetails.html | 106 +++++ .../index.html | 163 -------- .../index.html | 56 --- .../additionalDetails.html | 70 ++++ .../index.html | 85 ---- .../index.html | 58 --- .../index.html | 77 ---- .../additionalDetails.html | 41 ++ .../index.html | 65 --- .../additionalDetails.html | 52 +++ .../index.html | 98 ----- .../additionalDetails.html | 31 ++ .../index.html | 51 --- .../additionalDetails.html | 53 +++ .../index.html | 103 ----- .../additionalDetails.html | 49 +++ .../index.html | 63 --- .../additionalDetails.html | 253 +++++++++++ .../index.html | 253 ----------- 126 files changed, 4224 insertions(+), 8147 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/cadfc679/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/cadfc679/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/cadfc679/nifi/nifi-nar-bundles/nifi-framework-bundle/pom.xml ---------------------------------------------------------------------- diff --cc nifi/nifi-nar-bundles/nifi-framework-bundle/pom.xml index 18f889c,fcb1243..4c07d75 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/pom.xml @@@ -106,8 -107,13 +106,13 @@@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-web-security</artifactId> - <version>0.0.2-incubating-SNAPSHOT</version> + <version>0.1.0-incubating-SNAPSHOT</version> </dependency> + <dependency> + <groupId>org.apache.nifi</groupId> + <artifactId>nifi-documentation</artifactId> + <version>0.0.2-incubating-SNAPSHOT</version> + </dependency> </dependencies> </dependencyManagement> </project>
