Commit Graph

3882 Commits

Author SHA1 Message Date
Mark Payne e18c0a7d26 NIFI-503: Removed dependencies on commons-lang3 and commons-io 2015-04-10 09:37:53 -04:00
Mark Payne 512ac9c704 NIFI-504: Removed erroneous copyright notice 2015-04-10 08:42:43 -04:00
Mark Payne 10d002c78a NIFI-244: Fixed copy/paste error that called out website as http://http://... instead of just http://... 2015-04-10 08:40:22 -04:00
Matt Gilman c1959b3e2d NIFI-501:
- Ensuring the property descriptor is loaded before adding/updating the property in the table.
2015-04-10 06:56:51 -04:00
Mark Payne b682b6fab5 NIFI-74, NIFI-345, NIFI-495: Fixed several site-to-site related bugs 2015-04-09 17:59:02 -04:00
Mark Payne e9cb3b300c NIFI-244: Initial import of GetTwitter processor 2015-04-09 17:56:52 -04:00
Mark Payne 178c5cd287 NIFI-505: Initial import of language translation nar 2015-04-09 17:55:33 -04:00
Mark Payne ff0bd2c669 504: Initial import of geo enrich processors 2015-04-09 17:54:59 -04:00
Mark Payne 45416dc66b NIFI-506: Initial import of HL7 work 2015-04-09 17:54:33 -04:00
Matt Gilman eb023e57b2 NIFI-494:
- Escaping parameters as appropriate.
- Additional error handling.
2015-04-09 15:49:46 -04:00
Mark Payne e8fde85914 NIFI-496: Only update the updatedAttributes map if a value is changed 2015-04-09 09:31:20 -04:00
bbende a58891af1f Merge remote-tracking branch 'upstream/develop' into nifi-solr-bundle 2015-04-08 17:48:26 -04:00
Mark Payne abd279c1e0 NIFI-488: Redirect nifi output streams and redirect bootstrap log messages to file 2015-04-08 13:41:34 -04:00
Mark Payne 7819afbefd NIFI-495: Fixed handling of FlowFiles if destination full by rolling back session 2015-04-08 13:38:33 -04:00
Brandon DeVries e1e1aecc8b Merge branch 'NIFI-433' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-433 2015-04-08 12:39:41 -04:00
Brandon DeVries 3c4ea67dde updating NarUnpacker to use multiple library directories 2015-04-08 12:39:24 -04:00
Brandon DeVries ee0f4ef21e updating properties to support multiple nar libraries 2015-04-08 12:39:23 -04:00
Matt Gilman 2154b822bf NIFI-475:
- Adding support to create controller services inline when editing a components properties.

NIFI-475:
- Adding support to create controller services inline when editing a components properties.

NIFI-475:
- Prompting the user to save changes before navigating to the controller service definition.

NIFI-475:
- Adding support to create controller services inline when editing a components properties.

NIFI-475:
- Adding support to create controller services inline when editing a components properties.

NIFI-475:
- Prompting the user to save changes before navigating to the controller service definition.

NIFI-475:
- Prompting the user to save changes before navigating to the controller service definition.

NIFI-475:
- Prompting the user to save changes before navigating to the controller service definition.

NIFI-475:
- Only providing the option to go to the service if the dialog is originating from the canvas (not for instance the summary page).

NIFI-475:
- Removing the children from the documented types. This prevents conveying the documented type hierarchies but that isn't necessary given the support for creating instances inline when editing properties.

NIFI-475:
- Removing the type hierarchies from the new controller service dialog.

NIFI-475:
- Including the controller service description in the inline controller service dialog.
2015-04-08 12:25:48 -04:00
Matt Gilman e456ea37f4 Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop 2015-04-08 11:28:44 -04:00
Matt Gilman d769b50e39 NIFI-493:
- Fixing the number of documented components.
- Fixing unordered list creation.
2015-04-08 08:39:05 -04:00
bbende 89b0de8572 Merge remote-tracking branch 'upstream/develop' into nifi-solr-bundle 2015-04-07 18:29:38 -04:00
Brandon DeVries 275735648a updating NarUnpacker to use multiple library directories 2015-04-07 16:18:48 -04:00
Brandon DeVries b1970ecc10 updating properties to support multiple nar libraries 2015-04-07 16:05:55 -04:00
Mark Payne 8d20b82095 NIFI-492: When attempting to get a connection from the pool, if we create a new one and encounter an error, should ensure we close the new connection 2015-04-07 14:16:54 -04:00
Mark Payne 39735c30bc Merge branch 'develop' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop 2015-04-07 12:46:48 -04:00
Mark Payne c974ea90f8 NIFI-491: Fixed bug that caused InvocationTargetException.getCause().getCause() instead of InvocationTargetException.getCause(); also if null passed into logger, avoid the NPE that results 2015-04-07 12:41:31 -04:00
Mark Payne a7862a19ba NIFI-490: If IO error when creating Site-to-Site transaction, cleanup connection 2015-04-07 12:36:35 -04:00
Matt Gilman 7369730cea NIFI-489:
- Using the underlying instance in the base class instead of the proxy.
2015-04-07 10:15:54 -04:00
Matt Gilman 4f015f5f43 Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop 2015-04-07 10:14:09 -04:00
Mark Payne 3a2b12d7c9 NIFI-486: Fixed NPE that occurs if processor allows for controller service as optional property and no value set
Signed-off-by: joewitt <joewitt@apache.org>
2015-04-06 21:13:30 -04:00
Mark Payne 50986932d6 NIFI-486: Fixed NPE that occurs if processor allows for controller service as optional property and no value set 2015-04-06 17:59:07 -04:00
Matt Gilman e79db821b6 Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop 2015-04-06 07:20:24 -04:00
bbende 5b3709fe0c Adding support for dynamic properties to PutSolrContentStream 2015-04-05 22:22:49 -04:00
bbende bd6159e97f Merge remote-tracking branch 'upstream/develop' into nifi-solr-bundle 2015-04-05 18:49:27 -04:00
Jon Anderson 4a16845309 NIFI-484 EvaluateJsonPath: always overwrites content
Signed-off-by: Mark Payne <markap14@hotmail.com>
2015-04-05 14:22:46 -04:00
Jon Anderson 2b21b46501 org.apache.nifi.controller.exception.ProcessorLifeCycleException should be renamed to ComponentLifeCycleException
Signed-off-by: Mark Payne <markap14@hotmail.com>
2015-04-05 09:43:10 -04:00
Matt Gilman 6bbd172399 NIFI-481:
- Enabling enter to add a new property.
- Autoselecting and scrolling to new property rows.
2015-04-02 22:34:34 -04:00
Matt Gilman 2c352267af NIFI-449:
- Adding a link to the nfel styles.
2015-04-01 11:40:17 -04:00
Matt Gilman e2878170a1 NIFI-477:
- Updating the property details shown in a read only dialog for properties with allowable values. Now rendering a read only combo to show the value's display name and the other available options.
2015-04-01 11:15:07 -04:00
Matt Gilman 30fc75e2b8 NIFI-480:
- Addressing issues caused by canceling a dialog by pressing escape. Previously pressing escape would cause too many dialogs to close. This could lead to potential configuration loss if there was other unsaved changes.
2015-04-01 09:42:33 -04:00
Mark Payne 4752e284f6 NIFI-478: Fixed bug that caused byte sequence to be dropped for last split under certain circumstances; added new unit tests
Signed-off-by: joewitt <joewitt@apache.org>
2015-03-31 23:03:25 -04:00
Matt Gilman e9647717e3 Squashed commit of the following:
commit 9cfc3ab42fbe46af113a1f0db41aa95e6e0b4568
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Mar 31 16:32:13 2015 -0400

    NIFI-250:
    - Updating test to fix compilation error after merge.

commit 266d44b11c92cea51f882483adcfa898feeaac44
Merge: 97632fb e7d6d94
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Mar 31 16:11:12 2015 -0400

    Merge branch 'develop' into NIFI-250

commit 97632fbce67850c66b765f667ec2a1ed6e540914
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Mar 31 12:12:01 2015 -0400

    NIFI-250:
    - Removing extra call to show configuration dialog.

commit 23465a1e116ee10c2c73a9ed25d7b382096f9b52
Merge: d4321f5 1abee29
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Mar 31 11:09:32 2015 -0400

    Merge branch 'NIFI-250' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250

commit 1abee2964380bf2aee91189f471035fe3df92919
Author: Mark Payne <markap14@hotmail.com>
Date:   Tue Mar 31 10:58:53 2015 -0400

    NIFI-250: Fixed bugs with configuring reporting tasks on restart

commit 712327fe8eac0c96a4d676a1ffe2210801d97200
Merge: abd1dc3 1cee436
Author: Mark Payne <markap14@hotmail.com>
Date:   Tue Mar 31 08:41:56 2015 -0400

    Merge branch 'NIFI-250' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250

commit abd1dc3362ef6297eb3f044aadc58c181114fe06
Author: Mark Payne <markap14@hotmail.com>
Date:   Tue Mar 31 08:41:45 2015 -0400

    NIFI-250: Fixed bug that caused IllegalArgumentException when loading reporting tasks on NCM if property is not set

commit d4321f50d6adc1534d318405fb23838032c054d7
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Mar 31 07:39:47 2015 -0400

    NIFI-250:
    - Updating Javadocs.

commit 5394a826b07bb897299bebefe275f633c02e95ce
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Mar 31 07:30:57 2015 -0400

    NIFI-250:
    - Updating messages included in exceptions during error conditions when interacting with a custom UI.

commit 1cee4367888d899d9396f7e48f2badfa8e11f07c
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Mar 30 14:54:16 2015 -0400

    NIFI-250:
    - Fixing the width of the referencing components when the content overflows.

commit b32e2712c1735d57bf1d34debb0268e42a544c56
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Mar 30 14:19:49 2015 -0400

    NIFI-250:
    - Using a List when (de)serializing allowable values. This is preferable than calling out a specific Set implementation.

commit 2949beb6f57a7af469257a27adffa9397e234d7b
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Mar 30 13:20:55 2015 -0400

    NIFI-250:
    - Only recording previously configured controller service when attempting to change a controller service.
    - Only polling schedulable components when stopping. No need to poll during start requests.

commit 0b77160da76877b35a5777b0bcf552d5985ba64d
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Mar 30 13:17:44 2015 -0400

    NIFI-250:
    - Adding tooltip to referencing components section of the enable/disable controller service dialog.
    - Fixing typo.

commit 37d2bd1e1e564c516cb2d96c7f1b361c9034110a
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Mar 30 12:10:44 2015 -0400

    NIFI-250:
    - Fixing controller service ancestor calculation.

commit 2673c39a62462e5ade8363b379424241029f2058
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Mar 30 12:09:37 2015 -0400

    NIFI-250:
    - Correcting the number of displayed controller service types.
    - Adding more indentation.

commit 0a7c55705fcdb485b6a8278fe39dd31f6e21639e
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Mar 27 15:23:55 2015 -0400

    NIFI-250:
    - Reloading newly and previously referenced controller services when modifying the referencing controller service. (ie adding/changing/removing the reference).

commit 0d975028efdb07439ea21f1e3654b2c3cc939a93
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Mar 27 13:14:19 2015 -0400

    NIFI-250:
    - Fixing list item wrapping

commit 1efa053b6af6b4d70bed608247b42bd9b92a9127
Merge: eaa8c51 92df0d7
Author: Mark Payne <markap14@hotmail.com>
Date:   Fri Mar 27 12:42:38 2015 -0400

    Merge branch 'NIFI-250' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250

commit eaa8c51f973b837ee5c41bb9fb7d09e98cd41824
Author: Mark Payne <markap14@hotmail.com>
Date:   Fri Mar 27 12:42:32 2015 -0400

    NIFI-250: Fixed bug when restoring Reporting Tasks on NCM; added documentation to some services; fixed bugs in Standard Validators

commit 92df0d7cc7074f4a14c571d1d69b2845b9a8ad7a
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Mar 27 09:39:27 2015 -0400

    NIFI-250:
    - Reverting change to reload service and referencing components on done to do always. Since the enable/disable request may poll or be canceled by a user.

commit be3254c947352486e5fe992184f8de6a5b20369f
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Mar 27 09:22:22 2015 -0400

    NIFI-250:
    - Adding a check to ensure we don't attempt to reload a controller service that has been removed but is still referenced by another controller service.

commit 21ab41fbe1cbd3460eb544ba96c18e120e7e67e3
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Mar 27 09:16:24 2015 -0400

    NIFI-250:
    - Fixing typo in the scope tooltip.

commit 56f8dd972b4565a367fe317deee5826c215874bd
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Mar 27 08:30:52 2015 -0400

    NIFI-250:
    - Ensuring the settings (controller service/reporting task) dialog is closed prior to opening a custom UI.

commit 3eb1ac16a59738db683739e48d362260cf2c4e03
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Mar 27 08:00:40 2015 -0400

    NIFI-250:
    - Ensuring the style on the comments field is reset when changing its value.

commit b51af3cb7a60fb11ddc2dedd328e35a92d39f0e3
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Thu Mar 26 15:12:09 2015 -0400

    NIFI-250:
    - Fixing issues when clicking Add before selecting the type of controller service and reporting task to create.

commit 5b56982d20b3a24ca59362a482c39ef6d4329b8d
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Thu Mar 26 11:55:56 2015 -0400

    NIFI-250:
    - Using the correct state variable when determining how to update a given controller service.

commit 6c678bfe6adf9e15b294523603dbf230d731b3c9
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Thu Mar 26 10:42:24 2015 -0400

    NIFI-250:
    - Prevented reading of the node response because when clustered the responses are merged and we need to use the updated entity.

commit ffb4e6b68b57f23b41703613557f7bf0da5bbce5
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Thu Mar 26 09:13:23 2015 -0400

    NIFI-250:
    - Only attempting to reload a controller service when one is actually referenced.

commit c61a2afbb8b0696b883c06dfd92abb3f3b111bb6
Merge: 8a830be a5e140f
Author: Mark Payne <markap14@hotmail.com>
Date:   Thu Mar 26 09:02:20 2015 -0400

    Merge branch 'develop' into NIFI-250

    Conflicts:
    	nifi/nifi-api/src/main/java/org/apache/nifi/components/ValidationContext.java
    	nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockValidationContext.java
    	nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/StandardValidationContext.java

commit 8a830bef412dfa44a54c840e24545defeed83f15
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Thu Mar 26 08:10:47 2015 -0400

    NIFI-250:
    - Rendering reporting tasks in controller service referencing components.
    - Ensuring referenced controller services are reloading when a reporting task changes.
    - Automatically selecting reporting task tab and item in table when linking to one via controller service referencing components.

commit 47e84c009db874b5f2151bd5eb92b403461c5730
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Thu Mar 26 08:04:17 2015 -0400

    NIFI-250:
    - Fixing issue preventing reporting task from being included in controller service referencing components.

commit fe24f368e8e317400d77491e904de6f76639fd53
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Thu Mar 26 07:04:51 2015 -0400

    NIFI-250:
    - Handling the appropriate type of exception when creating a controller service.

commit 4f01cd090972fd6b2712d914e7d2ea8eca8627b1
Merge: 8bef904 91e002e
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Thu Mar 26 06:55:03 2015 -0400

    Merge branch 'NIFI-250' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250

commit 91e002eb90795a1c2d2711c3e20db520fce155ff
Merge: 47435c8 5db358f
Author: Mark Payne <markap14@hotmail.com>
Date:   Wed Mar 25 15:46:19 2015 -0400

    Merge branch 'NIFI-250' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250

commit 47435c8bb7207358dbfef2fcfdad5e3fdd054434
Author: Mark Payne <markap14@hotmail.com>
Date:   Wed Mar 25 15:46:09 2015 -0400

    NIFI-250: Removed controller-services.xml and reporting-tasks.xml and associated properties

commit 8bef904df75e1ca190075c5b78e6f858031ec4e8
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Mar 25 15:29:18 2015 -0400

    NIFI-250:
    - Including properties and descriptors in controller service referencing components.

commit 5db358f4e580dc5a1129444ffc203a4041720160
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Mar 25 15:27:35 2015 -0400

    NIFI-250:
    - Populating the reporting task details when modifying a service that it references.

commit 975db1a7b33383200b2045fd1c97e29216d1c2b3
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Mar 25 15:07:30 2015 -0400

    NIFI-250:
    - Fixing issue when reloading transitive controller service referencing components.
    - Allowing reporting tasks to be reloaded (when they reference controller services).

commit 17b0fa7df170fa50f33236863481f008356cb1b4
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Mar 25 15:03:39 2015 -0400

    NIFI-250:
    - Addressing issues setting reporting task comments.
    - Including properties and descriptors in controller service referencing components.

commit f71588065d788de4d3957593d88473c6bc13c2a1
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Mar 25 11:07:13 2015 -0400

    NIFI-250:
    - Reordering the invocation of the modal close handler and the hiding of the dialog.
    - Separating loading from showing the settings so the actions can be performed independently. This allows the transition back to the controller service/reporting task table more smooth when viewing usage or a custom UI.

commit b8b9f2c2509d8101d2f749e4ce7c58ed7a52be96
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Mar 25 09:57:37 2015 -0400

    NIFI-250:
    - Ensuring requests are not attempted to be replicated if a custom UI provides an invalid component id.

commit 2dccb5b4d98a194a7cee307b2252962eebdb67b1
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Mar 25 09:28:55 2015 -0400

    NIFI-250:
    - Adding better handling when a request is interpreted as a request to create a processor/controller service/reporting task and the type is not specified.

commit e8294f29e2f5aef8cec0117cd09a2242b5ef2ca9
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Mar 24 15:31:40 2015 -0400

    NIFI-250:
    - Reopening the settings to the controller services/reporting tasks table after showing usage or custom UIs.

commit d8a27993d0d7a7650f59d595c58eb99e5140c82c
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Mar 24 14:15:08 2015 -0400

    NIFI-250:
    - Adding support to configure reporting task comments. Comments still need to be persisted to flow xml.

commit ec21493622a9cc9ce0857c0b37d48a08f120a770
Author: Mark Payne <markap14@hotmail.com>
Date:   Tue Mar 24 13:07:05 2015 -0400

    NIFI-250: Restore Comments and AnnotationData for Reporting Tasks on NCM; these were inadvertently skipped

commit de21b6090c821a0dd4421d0637a2fd87a5a894d7
Merge: 4dcb9fd 953cb12
Author: Mark Payne <markap14@hotmail.com>
Date:   Tue Mar 24 12:49:48 2015 -0400

    Merge branch 'NIFI-250' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250

commit 953cb1227af70e846e47416ffdbc6eb3a1686d6a
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Mar 24 12:28:30 2015 -0400

    NIFI-250:
    - Providing access to the merged node response when clustered. This is necessary as custom UIs will need to access to these details.
    - Ensuring the cluster processor endpoint is merged appropriately.

commit 4dcb9fd761dfaec98790c41ca16344a1d0b89340
Author: Mark Payne <markap14@hotmail.com>
Date:   Tue Mar 24 10:16:47 2015 -0400

    NIFI-278: Added documentation and ensured that all annotations invoke with consistent arguments

commit 80b8c602433cc7b6589b417524a23b63c891d3f1
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Mar 24 08:58:30 2015 -0400

    NIFI-250:
    - Updating custom UI to fully support the new model (by removing references to processors).

commit 691b4617d5568cd9a28f38d081b85d233ccbea44
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Mar 24 08:57:34 2015 -0400

    NIFI-250:
    - Updating custom UIs to support both old (deprecated) and new models.
    - Ensuring the annotation data is populated in outgoing DTOs.
    - Ensuring the component type is populated in the details for custom UIs.
    - Renaming the js module for custom UIs to exclude the reference to processors.

commit dbaa219df12207d80b9e5f110443886b95bb5a7c
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Mar 23 14:32:28 2015 -0400

    NIFI-250:
    - Renaming the standard nifi web configuration context.
    - Adding support for controller services and reporting tasks to the nifi web configuration context.

commit 3e7ca3838039d724eba019214b073a8640e61149
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Mar 23 13:09:15 2015 -0400

    NIFI-250:
    - Continuing to merge changes from the content viewer with the newly supported component UI extensions.

commit d3bb3ab829bbeaa93453509e33a7b3f165365987
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Mar 23 11:34:18 2015 -0400

    NIFI-250:
    - Only prompting users for the property name and immediately adding to the table. In the background, the property descriptor is loaded from the processor and then used when editing the property.

commit 1c96bd08f7903f9acc845a542ccb7196f8a264c0
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Mar 23 09:49:18 2015 -0400

    NIFI-250:
    - Removing unneeded artifact.

commit 1de514adf7a3dacc51823932b70de3f8f64c369a
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Mar 23 09:36:07 2015 -0400

    NIFI-250:
    - More clean up post merge with the data viewer.

commit d19471d6da17974ab6485f3653b4d793b30e895c
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Mar 23 08:20:04 2015 -0400

    Resolving conflicts when merging develop into NIFI-250

commit 65e35e49a5bb1d81cf0933220bf1204131dc72d5
Merge: a4555d1 e05c9fd
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Mar 23 08:09:33 2015 -0400

    Merge branch 'develop' into NIFI-250

    Conflicts:
    	nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
    	nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java
    	nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
    	nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml

commit a4555d1a17252bedf503e443223670d34c5acd0d
Merge: 6a31b94 fcff5c4
Author: Mark Payne <markap14@hotmail.com>
Date:   Fri Mar 20 15:52:18 2015 -0400

    Merge branch 'NIFI-250' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250

commit 6a31b94b39c07f943d9145889bc96078921cb2d0
Author: Mark Payne <markap14@hotmail.com>
Date:   Fri Mar 20 15:52:09 2015 -0400

    NIFI-250: Fixed bug with templates related to services referencing other services

commit fcff5c40a22a42bedbdd488dc540f4e80d6caf68
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Mar 20 15:35:54 2015 -0400

    NIFI-250:
    - Adding endpoints for obtaining [processor|controller service|reporting task] property descriptors.

commit e0e2d161b5f577b2d3c012843c6fde2123cb3411
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Mar 20 15:33:36 2015 -0400

    NIFI-250:
    - Adding endpoints for obtaining [processor|controller service|reporting task] property descriptors.

commit bd999d16ad804a0c71e6188dac0da57ceda58996
Author: Mark Payne <markap14@hotmail.com>
Date:   Fri Mar 20 14:51:26 2015 -0400

    NIFI-250: Include referenced controller services in templates

commit 02afcfbf4585eba10be1aeb90674c43933b63d88
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Mar 20 14:39:15 2015 -0400

    NIFI-250:
    - Removing link to jQuery migration script.

commit 10ebbf0c3e9155e43dfbe866c42a27a021d3dc42
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Mar 20 14:38:47 2015 -0400

    NIFI-250:
    - Specifying the correct UI extension type before populate the service/task DTO.

commit 07941b5209fa182b02ac7e2d66ebade0416c4319
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Mar 20 14:38:09 2015 -0400

    NIFI-250:
    - Closing the controller service and reporting task shell whenever a custom UI is opened.

commit 5c98ccdbfb15d330ecce118feab98ac0681d6f1a
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Mar 20 13:09:38 2015 -0400

    NIFI-250:
    - Renaming interface that custom UIs use to interact with the NiFi instance.
    - Javadocs.
    - Ported UpdateAttribute to use updated custom UI model.
    - Fixed bug when discovering types of components that support custom UIs.

commit 24d787e5d40949659427e72d126dd2a225b6ff86
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Mar 20 10:51:15 2015 -0400

    NIFI-250:
    - Updating the way in which UI extensions interact with the underlying NiFi instance.

commit ffa919a349906ef3a8fe178ab448fe69bf1bd4b6
Author: Mark Payne <markap14@hotmail.com>
Date:   Thu Mar 19 14:12:11 2015 -0400

    NIFI-250: Fixed NPE

commit c63a8c05ff64196a0fc77a2386c60bac88784ad0
Merge: 800f80b 42f8e81
Author: Mark Payne <markap14@hotmail.com>
Date:   Thu Mar 19 09:31:46 2015 -0400

    NIFI-250: Fixed handling of controller services on startup and resolved merge conflicts

commit 800f80bc05ead5f097c9e948f619e0dd681ca592
Author: Mark Payne <markap14@hotmail.com>
Date:   Thu Mar 19 09:28:05 2015 -0400

    NIFI-250: Fixed controller service handling on startup

commit 42f8e819811835c94744276cde741ebcdbb1a57e
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Mar 18 21:22:44 2015 -0400

    NIFI-250:
    - Updating UI extension type.

commit 6c058778534adae967ee34ec5fb2b8c20b66d43b
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Mar 18 16:09:44 2015 -0400

    NIFI-250:
    - Starting to refactor support for UI extensions.
    - Deprecating previous support.

commit f0c660c25ee0e2b1a6acd9b8e876144cad9b0d6b
Merge: b45c09c e569af6
Author: Mark Payne <markap14@hotmail.com>
Date:   Wed Mar 18 10:12:13 2015 -0400

    Merge branch 'develop' into NIFI-250

commit b45c09cacdbaf93f79dad95a9a258d82fed40831
Author: Mark Payne <markap14@hotmail.com>
Date:   Wed Mar 18 10:09:40 2015 -0400

    NIFI-368: Implemented methods that were not implemented from interface

commit 454c837ce1e63f780e648e86495c4e5c038fc090
Merge: d7210da e750579
Author: Mark Payne <markap14@hotmail.com>
Date:   Wed Mar 18 09:37:10 2015 -0400

    Merge branch 'NIFI-250' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250

commit d7210da40eda444267133fdfbbf2a8a378590e82
Author: Mark Payne <markap14@hotmail.com>
Date:   Wed Mar 18 09:37:06 2015 -0400

    NIFI-250: Fix the way that services are restored at startup

commit e750579d77ea3b69b438b57d5f468af6f51ff049
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Mar 18 07:40:20 2015 -0400

    NIFI-250:
    - Ensuring controller service comments are included when saving.
    - Adding a label to the comments in the service details dialog.

commit f10bb997b84cce32d30ded918a93ea8f9d511016
Merge: 25ca4f8 c118ead
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Mar 18 06:58:44 2015 -0400

    Merge branch 'develop' into NIFI-250

commit 25ca4f89e875bb8b7c89b75756793e1863190621
Merge: 769ed68 1cca300
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Mar 17 16:03:08 2015 -0400

    Merge branch 'develop' into NIFI-250

commit 769ed68c51233443bd210e6af3ee6c0b96a5de7d
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Mar 17 10:47:43 2015 -0400

    NIFI-425:
    - Reseting the filter in the new controller service and new reporting task dialog.
    - Setting the initial focus.
    - Fixing the close handler configuration.

commit 985aa134c4c5a43b1570b669e0d32c40be28e152
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Mar 17 09:49:09 2015 -0400

    NIFI-250:
    - Addressing cancel action when initiated by pressing escape. Previously it was canceling every dialog that was open when it should have only applied to the top most.

commit bf7027c0760b433c3580a77282df24ed5aac67f2
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Mar 17 08:32:13 2015 -0400

    NIFI-425:
    - Filtering is not clear when closing the new processor dialog.

commit aa21d073d55dff3702dbb811b80d0947f745538a
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Mar 17 08:18:06 2015 -0400

    NIFI-250:
    - Merging develop into NIFI-250.

commit c28d9f57287b5b95d6451a5365dbc2b3d4552422
Merge: 5a6723c 761e64a
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Mar 17 08:16:36 2015 -0400

    NIFI-250: Merge develop into NIFI-250

commit 5a6723c0465d15e603ee7cbec9b1e58a80f0f036
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Mar 16 15:56:14 2015 -0400

    NIFI-250:
    - Fixing enable button label.

commit 02b9e4b0a91e65625f10437bf9459e8005b3459c
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Mar 16 13:20:16 2015 -0400

    NIFI-250:
    - Setting the correct visibility on the controller service name field.

commit 24c86facff21f133a62bffe2f5927a45e1b9d059
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Mar 16 12:34:17 2015 -0400

    NIFI-250:
    - Using .html() instead of .text() as the service/task description is already escaped.

commit dddf5e8841977321cce2f287be2728f3163ad5a4
Merge: 30f9323 eb757a4
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Mar 16 11:41:26 2015 -0400

    Merge branch 'develop' into NIFI-250

commit 30f9323a0cdf6f783c94ff0c7120b2c042dd8194
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Mar 16 11:38:08 2015 -0400

    NIFI-250:
    - Ensuring the new property dialog is only destroy when appropriate. There were cases when we wanted to clear the property table but leave the new property dialog intact.

commit af855ba123db2dc8b9d5e96f47aabb5d76055130
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Mar 16 10:19:28 2015 -0400

    NIFI-250:
    - Using the correct element names when attempting to parse the reporting task configuration file.

commit 5a57670c70012e5d8e091076f74c14b1fa78a735
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Mar 16 09:21:21 2015 -0400

    NIFI-250:
    - Ensuring the editable flag is set correctly when creating a property table.
    - Properly cleaning up the new property dialog.

commit 19b6845b66da5e45d8a974f7d4d7cd01712ef698
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Mar 16 08:43:55 2015 -0400

    NIFI-250:
    - Ensuring the actions columns is always last.
    - Fixing field visibility (between read only and editable).

commit 17b512ea8e720115b6bce1c5f65797d256392781
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Mar 16 07:45:05 2015 -0400

    NIFI-250:
    - Using a utility function for populating fields.
    - Using a label for scheduling strategy rather than the enum value.

commit 92cbce496936c7e166c8666b379dcc8582b6d121
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Mar 16 07:30:50 2015 -0400

    NIFI-250:
    - Adjusting the layout of the reporting task dialog.
    - Renaming the reporting task run status column.

commit 2c6f3a97276975899be6cc0266d6770bc88e1718
Merge: a1a7691 2de2134
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Mar 16 07:04:11 2015 -0400

    Merge branch 'develop' into NIFI-250

commit a1a769104881eaf44ca9736cd185edc972eb5807
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Mar 13 14:48:08 2015 -0400

    NIFI-250:
    - Updating the controller service dialog to support a read only and editable modes.

commit 40670067cb67d9df8a1817fd0c5b3a86d627d3a9
Merge: b1d65e5 d122a83
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Mar 13 14:17:05 2015 -0400

    Merge branch 'NIFI-250' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250

commit b1d65e560a00925345222508c370b91a878a9ab2
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Mar 13 14:16:44 2015 -0400

    NIFI-250:
    - Updating the controller service dialog to support a read only and editable modes.
    - Ensuring the new property dialog is cleaned up if a property table instance is re-initialized (dom leak).
    - Better rending controller service state.
    - Fixing issue with component history when opening the processor details dialog.

commit d122a83633683285cc6fd6daf65f0f533a0da2ca
Author: Mark Payne <markap14@hotmail.com>
Date:   Fri Mar 13 12:01:00 2015 -0400

    NIFI-250: Fixed NPE

commit 52ea335d7c7e75b01f604a13c15f2b30c1b8df5c
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Mar 13 11:07:31 2015 -0400

    NIFI-250:
    - Only handling new controller service state if it's actually different than the current value.

commit 50f0c123bcb8474b110aac0abc528c0f9b6fe24a
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Mar 13 10:46:49 2015 -0400

    NIFI-250:
    - Including active threads in the reporting task dto.
    - Verifying actions taken against component referencing controller services.
    - Rendering the run state for reporting tasks (including active thread counts).

commit cd69a423dd6411cdefe1a3131865fc45f440d426
Merge: 6b36aef f556490
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Mar 13 10:11:22 2015 -0400

    Merge branch 'NIFI-250' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250

commit 6b36aefef942482a665182594fd3bb1044cad627
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Mar 13 10:11:17 2015 -0400

    NIFI-250:
    - Adding active thread count on reporting tasks.
    - Merging clustered responses for controller service and reporting task endpoints.

commit f556490fb789706d4670ba6aef717de82285f29d
Author: Mark Payne <markap14@hotmail.com>
Date:   Fri Mar 13 09:16:41 2015 -0400

    NIFI-250: Added verify methods to controller service provider

commit 79ddcb828e678e38ffb67f524bed03a72a3361dc
Merge: d5a9a1a 7198912
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Mar 13 06:49:10 2015 -0400

    Merge branch 'develop' into NIFI-250

commit d5a9a1a625e28f3d0a7d6ed72019e84088a05794
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Thu Mar 12 12:36:17 2015 -0400

    NIFI-250:
    - Updating button visibility to always show the enable/run buttons when the service/task is disabled/stopped. Previously the enable/run buttons were only visible the component did not have any validation errors. However, this caused the buttons to shift and the alignment to be off.

commit 8cc58fe80bf402bb594e391f980e565f1a2318f3
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Thu Mar 12 12:11:33 2015 -0400

    NIFI-250:
    - Adding a button to link to the usage of a controller service or reporting task.

commit c9604a3fcacf4c33606ca0be767c9d89ef4424a0
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Thu Mar 12 11:10:39 2015 -0400

    NIFI-250:
    - Adding support for configuring the scheduling strategy and scheduling period for reporting tasks.

commit ca7b65262113a61ef9716dec0367fc24e19f5a05
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Thu Mar 12 08:16:13 2015 -0400

    NIFI-250:
    - Trying to ensure accurate details when enabling/disabling controller service and minimize web requests.
    - Fixing issues with the enabled flag in the controller service and reporting task dialog.

commit ae3c29aa562f15b8af89afdeec15475a2dd96fb5
Merge: 4f41202 56cc186
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Thu Mar 12 06:50:16 2015 -0400

    Merge branch 'develop' into NIFI-250

commit 4f41202e9df732211f9a9b2ccd54d1f652984d8b
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Mar 11 16:36:56 2015 -0400

    NIFI-250:
    - Updating controller service auditing to ensure transitive referenced components are reported correctly.
    - Restoring reference to reporting task provider.

commit fe09680deaa76e9de7c962c98e50492173a1748e
Merge: 4003542 85e38dc
Author: Mark Payne <markap14@hotmail.com>
Date:   Wed Mar 11 15:48:04 2015 -0400

    Merge branch 'NIFI-250' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250

commit 40035429f886a501312b25b14f94cab38ed0c97f
Author: Mark Payne <markap14@hotmail.com>
Date:   Wed Mar 11 15:47:58 2015 -0400

    NIFI-250: Added missing methods to ReportingTaskProvider

commit 85e38dc0555bf6a37ec378fc19b3a7811f8a32b3
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Mar 11 15:40:23 2015 -0400

    NIFI-250:
    - Setting the default name of the reporting task.

commit 74d45aefbf6f74b04cd23808e4bb866cce027dc9
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Mar 11 15:26:45 2015 -0400

    NIFI-250:
    - Adding methods to obtain all reporting tasks.
    - Adding parameters to update the scheduled state of a reporting task.
    - Adding action buttons to the reporting task table.

commit 2211741cad47ba24027f78f2e005cac888c8cb70
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Mar 11 13:50:02 2015 -0400

    NIFI-250:
    - Fixing issues showing the progress when enabling/disabling a controller service.
    - Ensure state for the service and its referencing components at all time since the action could be cancelled at any time.

commit fc76a6165910441a372234dd3a4e626a83cbba48
Author: Mark Payne <markap14@hotmail.com>
Date:   Wed Mar 11 10:41:48 2015 -0400

    NIFI-250: Fixed import that was accidentally removed

commit 0d8cc34ae16979853a05b0ef214cd62694a31daf
Merge: baa0e74 048c5d9
Author: Mark Payne <markap14@hotmail.com>
Date:   Wed Mar 11 08:45:36 2015 -0400

    Merge branch 'NIFI-250' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250

commit baa0e74cc37a6c74097da82ebf85d3b6e8e01d1a
Author: Mark Payne <markap14@hotmail.com>
Date:   Wed Mar 11 08:45:33 2015 -0400

    NIFI-250: Load controller services in correct order instead of arbitrary order

commit 048c5d9aa757e3d2917d558857a59c4b6a6221f0
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Mar 10 16:39:15 2015 -0400

    NIFI-250:
    - Updating the progress label when enabling/disabling controller services and their referencing components.

commit 51d70bff34174e19cd844404b8c0a61be79a8f39
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Mar 10 14:32:30 2015 -0400

    NIFI-250:
    - Showing the progress of enabling/disabling of a controller service so the user knows what the status of each step. This is especially important when the action fails someplace in the middle.

commit 5cc6fda21b9081e426b8a65132d0d971ef645c15
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Mar 9 16:38:39 2015 -0400

    NIFI-250:
    - Updating the enable/disable dialog to show the current status while waiting for referencing components.

commit 6d12f134ff22927d02c7c500a5650b855fa52289
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Mar 9 14:57:18 2015 -0400

    NIFI-250:
    - Adding a close button after enabling/disabling a controller service. This gives the user an opportunity to review issues prior to closing the dialog.

commit eb6c5b5e23e5b0af4fdb88c6264ba0b05efdbb94
Merge: bde21cb 3533a4a
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Mar 9 14:14:07 2015 -0400

    Merge branch 'develop' into NIFI-250

commit bde21cb8a6227e9b59f1af7266e949a5cd41b87f
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Mar 9 09:39:18 2015 -0400

    NIFI-250:
    - Updating the layout of the enable/disable dialogs.
    - Showing referencing components validation errors where appropriate.

commit 73459ccb5cfbc4aa81201e6476bb47ae450b49f7
Merge: 6f86758 342ca17
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Mar 9 06:48:31 2015 -0400

    Merge branch 'develop' into NIFI-250

commit 6f867585e1fade734dfecca434942d85fe20701d
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Mar 6 15:47:56 2015 -0500

    NIFI-250:
    - Including validation errors in the controller service referencing components dto.

commit b1dcab62a7f2ff6f2d15ef559058c7ec2358541e
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Mar 6 11:30:14 2015 -0500

    NIFI-250:
    - Fixing missing import.

commit 91f69b0cf23422838ca1f055064ae90e8749738f
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Mar 6 10:16:23 2015 -0500

    NIFI-250:
    - Adding a factory bean for obtaining the appropriate ReportingTaskProvider given the configured operating mode (cluster/node).
    - Fixing copy/paste error with the ControllerServiceProvicer factory bean.

commit ed22742c0f27c66205838237f312ddac01a8f61a
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Mar 6 10:14:26 2015 -0500

    NIFI-250:
    - JS global hint.

commit bc508cd905daefc08389e921df6c681fa67dafdf
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Mar 6 09:42:48 2015 -0500

    NIFI-250:
    - Reseting the table size when opening the new controller service/reporting task dialog.
    - Fixing typo during scroll events over the breadcrumbs.
    - JS global hint.

commit e5a314116bb43c54c2a920a7930423de038004cc
Merge: 6b429bf bd74063
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Mar 6 08:19:37 2015 -0500

    Merge branch 'develop' into NIFI-250

commit 6b429bf42b5f31e6b7bfc18d932c9cd48a67e702
Merge: f34e343 883c4ac
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Mar 6 08:19:26 2015 -0500

    Merge branch 'NIFI-250' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250

commit 883c4ac9d7a1cdbd6989fb1312624a752c490461
Merge: 83eff8d 2d4aebf
Author: Mark Payne <markap14@hotmail.com>
Date:   Wed Mar 4 15:50:58 2015 -0500

    Merge branch 'NIFI-250' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250

commit 83eff8d6df7b485a4d0eb03f176e4a28ff81df3b
Author: Mark Payne <markap14@hotmail.com>
Date:   Wed Mar 4 15:50:30 2015 -0500

    NIFI-250: Creating ReportingTaskProvider

commit f34e34391716c0168b74241c284db3ffab444fe5
Merge: 2d4aebf 5e0026c
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Mar 4 09:30:23 2015 -0500

    Merge branch 'develop' into NIFI-250

commit 2d4aebf33b50b7603f2c19ba63d368bf125ce498
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Feb 20 15:08:39 2015 -0500

    NIFI-250:
    - Continuing to setup Reporting Task management in the UI.

commit c1077baf95f8c7e5ffc16ccea190b56af59c3fcc
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Feb 20 13:39:11 2015 -0500

    NIFI-250:
    - Enabling/Disabling controller service and referencing components in the appropriate order.
    - Continuing to setup Reporting Task management in the UI.

commit 573a8aa353bb47cbfc782d06786f31a93faa3d7a
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Thu Feb 19 16:30:50 2015 -0500

    NIFI-250:
    - Using controller service state field instead of enable flag.
    - Continuing to setup Reporting Tasks.

commit a227fe46b542fdcd6dd6fe57f11d678da237bc98
Author: Mark Payne <markap14@hotmail.com>
Date:   Thu Feb 19 15:56:38 2015 -0500

    NIFI-250: Fixed bug that occurred in refactoring

commit be00d0caf34cb2ec4f192563cb2e8707d145e8b1
Author: Mark Payne <markap14@hotmail.com>
Date:   Thu Feb 19 15:20:24 2015 -0500

    NIFI-250: Added overloaded constructor to MockControllerServiceINitializationContext that allows no logger to be provided and autocreates one

commit f246565f7e5344db91f731e003c7e35e1d7cbe95
Author: Mark Payne <markap14@hotmail.com>
Date:   Thu Feb 19 15:04:13 2015 -0500

    NIFI-250: Incorporate new logic for controller service state

commit 852cc607f6fad61178f7c9d3a26807c24eee4e0e
Author: Mark Payne <markap14@hotmail.com>
Date:   Thu Feb 19 15:03:54 2015 -0500

    NIFI-368: generate bulletins when there are problems communicating with reporting tasks and controller services

commit ee63a10b8654c7a635e359eba9a7531aaf70fe6d
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Thu Feb 19 14:55:11 2015 -0500

    NIFI-250:
    - Removing enabled flag from controller service DTOs.

commit 767f37b8311f5fbbcfa5aacd6ef1230103034f09
Author: Mark Payne <markap14@hotmail.com>
Date:   Thu Feb 19 14:46:32 2015 -0500

    NIFI-250: Updated javadocs to clarify how lifecycle annotations are used; cleaned up handling of exceptions in scheduler

commit 5f2a4358869853deff7747ae3908d6952ee94001
Author: Mark Payne <markap14@hotmail.com>
Date:   Thu Feb 19 14:45:46 2015 -0500

    NIFI-368: added componentlog to the initialization contexts for appropriate components and made abstract components return logger via getLogger() methods

commit 8f78d619751c2bdb23f6c192a92716517922846a
Author: Mark Payne <markap14@hotmail.com>
Date:   Thu Feb 19 14:29:21 2015 -0500

    NIFI-368: Extracted methods from ProcessorLog out to ComponentLog and made ProcessorLog extend from ComponentLog. This maintains backward compatibility while providing more generic loggers for other components

commit 7de30ab15ad9570233c4bff68f37acf324a66dda
Author: Mark Payne <markap14@hotmail.com>
Date:   Thu Feb 19 13:30:37 2015 -0500

    NIFI-250: Refactoring of controller service states

commit 81d84546e7b456ae55cefe8892ddfb71a729bac9
Merge: 2ac6432 fac6cd7
Author: Mark Payne <markap14@hotmail.com>
Date:   Thu Feb 19 10:38:22 2015 -0500

    Merge branch 'NIFI-250' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250

commit fac6cd7ac6dc1ed883a18369ebfbbde0886b11ec
Merge: a3836d8 57b5d58
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Thu Feb 19 07:50:29 2015 -0500

    Merge branch 'develop' into NIFI-250

commit a3836d832d4cdc75a6b9317a04fed00c9b062c22
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Feb 18 15:17:48 2015 -0500

    NIFI-250:
    - Starting to add an endpoint for Reporting Tasks.

commit ffa7fd06d1c85e8aa45568e27f155309fb9bede9
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Feb 18 13:38:30 2015 -0500

    NIFI-250:
    - Adding the scope to the disable controller service dialog.

commit bbe185609ad037b8f1ed6529e25bea1b60613653
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Feb 18 13:38:11 2015 -0500

    NIFI-250:
    - Updating the controller services references endpoint to accept either an enabled flag for referencing controller services or a state for referencing schedulable components.

commit 4efd9622109f584daddb76d6b5de2399bd7d8209
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Feb 18 09:49:34 2015 -0500

    NIFI-250:
    - Updating the polling for controller service status when disabling.

commit 2ac643292c691d451cf98e2a309bff72182b0a88
Merge: d30a184 6457929
Author: Mark Payne <markap14@hotmail.com>
Date:   Wed Feb 18 08:15:45 2015 -0500

    Merge branch 'NIFI-250' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250

commit 6457929b25ba5923bebeb6ab4566e4208d1a092e
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Feb 17 15:32:31 2015 -0500

    NIFI-250:
    - Adding auditing to activating/deactivating controller service references.

commit e61a01ac6968ba2f1e4f8fa1d3ca9c2cbca400e6
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Feb 17 14:55:44 2015 -0500

    NIFI-250:
    - Only showing the enable button when the controller service is valid.
    - Adding polling during deactivation of controller service references to know when it's ok to attempt to disable the controller service.

commit f22407f59347010aede5c12cd64652a381f4fd59
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Feb 17 14:54:32 2015 -0500

    NIFI-250:
    - Updating the controller service references endpoint to accept an activated flag that drivens whether processors/reporting tasks are started/stopped and controller services enabled/disabled.

commit e4e61daa26c996d3234982cf1409bb501631b9d0
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Feb 17 12:48:39 2015 -0500

    NIFI-250:
    - Updating fill color dialog styling for use in updated modal plugin.
    - Making the fill color dialog draggable.

commit 4ce7202d93551acaea8e6f782df694eee1435ec5
Merge: 2769db7 0047fa4
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Feb 17 12:36:47 2015 -0500

    Merge branch 'develop' into NIFI-250

    Conflicts:
    	nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/dialog.css

commit 2769db7b4e783540b03bf2fee800a56d86e79d4d
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Feb 11 16:17:03 2015 -0500

    NIFI-250:
    - Adding an enable controller service dialog.

commit d30a1843c24caccf822811649332dad7e1aa5b17
Author: Mark Payne <markap14@hotmail.com>
Date:   Wed Feb 11 16:08:20 2015 -0500

    NIFI-250: Deleted dead code

commit 62b0669e121e817cd80ba21b8104ad9e210ea531
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Feb 11 11:25:04 2015 -0500

    NIFI-250:
    - Renaming references to referencing components to be more accurate.
    - Fixing borders around the referencing components.

commit 819c76b885268db294b62e11095faf52eaebf57c
Merge: ceede01 371e010
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Feb 11 11:14:37 2015 -0500

    Merge branch 'NIFI-250' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250

commit 371e0100d35864f0092b133a7decac34ffb4be33
Author: Mark Payne <markap14@hotmail.com>
Date:   Wed Feb 11 11:11:49 2015 -0500

    NIFI-250: Move activate/deactive methods for controller services' referencing components to ControllerServiceProvider

commit ceede01b8ffe57c003ac246b51854dd6b01ad70e
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Feb 11 10:45:14 2015 -0500

    NIFI-250:
    - Adding endpoints for retrieving and updating controller service referencing components.

commit 8a414b3ca9a542170cf31d6396c3e3e2947b90fc
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Feb 11 10:43:37 2015 -0500

    NIFI-250:
    - Adding endpoints for retrieving and updating controller service referencing components.

commit ed4d22c1ff17395a683a83d9f57dfdc842ce175f
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Feb 11 09:22:18 2015 -0500

    NIFI-250:
    - Additionally refactoring of removal of ControllerServiceProvider usage.

commit 0d2041b05ffc618c2393713e96c44cf8384aa6e3
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Feb 11 08:54:19 2015 -0500

    NIFI-250:
    - Replacing usage of ControllerServiceProvider with ControllerServiceLookup.

commit 3d38d8c98c180f5446b0f2dafea78eeec38e432e
Merge: 4bc5ed1 56a6bc4
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Feb 11 07:09:05 2015 -0500

    Merge branch 'develop' into NIFI-250

commit 4bc5ed13ef981b49390b1e8460105e8ed227b446
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Feb 10 14:34:48 2015 -0500

    NIFI-250:
    - Rendering the references in the disable controller service dialog.
    - Reloading controller service table when appropriate.
    - Padding in dialogs with a border.

commit 5390c7626a99c076daf05d06118815f902ab7b51
Author: Mark Payne <markap14@hotmail.com>
Date:   Tue Feb 10 11:54:17 2015 -0500

    NIFI-250: Fixed NPE in StandardSSLContextService

commit c25a2caecd31638d3564ea4892986d0580234783
Author: Mark Payne <markap14@hotmail.com>
Date:   Tue Feb 10 11:53:51 2015 -0500

    NIFI-250: Persist Controller Services and Reporting Tasks on NCM

commit 33f551630ac2664cf938834c7e450d04da7ec9f0
Author: Mark Payne <markap14@hotmail.com>
Date:   Tue Feb 10 11:08:05 2015 -0500

    NIFI-250: Remove references to Controller Service when the referencing component is removed

commit ea8cb59848e5cc75c201ce1b9521aa56eb293674
Author: Mark Payne <markap14@hotmail.com>
Date:   Tue Feb 10 09:48:01 2015 -0500

    NIFI-250: Expose number of active threads in ProcessorNode, ReportingTaskNode

commit 40e25066742f910a2c34881eb216a18d5233cdf1
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Feb 9 14:56:22 2015 -0500

    NIFI-250:
    - Reloading components that reference controller services when appropriate.
    - Created an icon for enabling a controller service.

commit 4481213849cee69537c23d54871c4dc07bd7fb87
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Feb 9 13:28:20 2015 -0500

    NIFI-250:
    - Updating dialogs to address issues when showing the borders within the modal plugin (especially in the controller service configuration dialog).
    - Fixing availability when creating a controller service in standalone.

commit 94d112b6ec90cc9df4adc9b85cc9df45908a1f36
Merge: c7ee77b b64fe47
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Feb 9 09:48:23 2015 -0500

    Merge branch 'develop' into NIFI-250

commit c7ee77be9781057109021c9db6981d9905397b3e
Merge: 7da7c93 0133f84
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Feb 9 07:35:46 2015 -0500

    Merge branch 'develop' into NIFI-250

commit 7da7c9327029a84581c5aff5f3435f2706d2c18e
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Feb 6 15:32:09 2015 -0500

    NIFI-250:
    - Updating the UI to gather the availability for a controller service during creation.
    - Removing the concept of availability from the core as the service/task can only be available on the cluster manager OR nodes.
    - Updating web tier to support this concept.

commit 55949a428f45b7e615c09d6f870196fcc95acfe7
Author: Mark Payne <markap14@hotmail.com>
Date:   Fri Feb 6 10:45:59 2015 -0500

    NIFI-250: Removed 'Availability' concept from reporting tasks and controller services because it is implicitly, depending on if on node or ncm

commit d95ca18a0cc6834defbf184e2cae5ee93228e832
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Feb 6 08:55:07 2015 -0500

    NIFI-250:
    - Javadocs.

commit 6892f19d61ebd4ae227b43452ba9c4303bd522eb
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Feb 6 07:52:38 2015 -0500

    NIFI-250:
    - Including the user who last modified the flow in the refresh tooltip.

commit 9f9466cb418b01295ecbe727dca07e82ddda9cb5
Merge: 4a8da60 d36a71c
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Feb 6 07:17:11 2015 -0500

    Merge branch 'develop' into NIFI-250

commit 4a8da60334f4b78a123906a6a712d95ec873c687
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Thu Feb 5 15:59:35 2015 -0500

    NIFI-250:
    - Refactoring revision checking so that we can lock appropriately on the Cluster Manager to manage controller services running there while other concurrent requests can be replicated amongst the cluster.

commit 17add531f656b6d8065bed74a887acaa00a07f9a
Merge: 3425dee 4a49ba7
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Thu Feb 5 07:13:56 2015 -0500

    Merge branch 'develop' into NIFI-250

commit 3425dee1f2aca679235b434b40bb49be8099ff55
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Feb 4 14:04:38 2015 -0500

    NIFI-250:
    - Invoking the appropriate save when updating controller services.

commit 6b91546d9d04dcb127cada3cdc907e9ef98abf42
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Feb 4 13:13:09 2015 -0500

    NIFI-250:
    - Fixing use of the optimistic locking manager factory bean.

commit cc8b096ffa11ee44f6d5fb5f07de51826dd27b20
Merge: 13fb1a7 ed53b46
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Feb 4 12:44:56 2015 -0500

    Merge branch 'develop' into NIFI-250

    Conflicts:
    	nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-table.js
    	nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
    	nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java

commit 13fb1a758b59cd7e205caed694f28b4d0dba9d82
Merge: 22822d3 037f36d
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Feb 2 09:27:26 2015 -0500

    Merge branch 'develop' into NIFI-250

commit 22822d33a2159d1f9a2b12caafbce7c2b46ebe52
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Feb 2 09:10:12 2015 -0500

    NIFI-250:
    - Updating the ControllerService endpoint to specify the availability of the service.
    - Updating the optimistic locking manager to ensure the proper revision is checked.

commit 346cc0cf14aad3f2240336eda711e63f29e62a7c
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Feb 2 07:55:57 2015 -0500

    NIFI-250:
    - Using the ControllerServiceProvider instead of delegating directly to the FlowController. This will allow us to work with the NCM when clustered.

commit 0cb1adbc1f1bf0272be813bf58b90444243b65b5
Merge: d1caa7e cc25d1d
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Feb 2 07:52:38 2015 -0500

    Merge branch 'NIFI-250' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250

commit d1caa7ee3e2e8662eeb2b368b2ed81fface22711
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Feb 2 07:52:32 2015 -0500

    NIFI-250:
    - Updating REST API for managing controller services.
    - Starting to add a dialog for disabling a controller service.

commit cc25d1d21cae8b30eff0db66d1ad9b6bbae5351d
Author: Mark Payne <markap14@hotmail.com>
Date:   Fri Jan 30 14:43:54 2015 -0500

    NIFI-250: Updated to pass Availability when creating controller services

commit e056bb7d70de8e1dea7bab9f59d9f466aef45eda
Author: Mark Payne <markap14@hotmail.com>
Date:   Fri Jan 30 14:37:42 2015 -0500

    NIFI-250: Fixed bug that caused EOFException if no reporting tasks defined on NCM

commit 4ae2a10e6d130353ea34aa403d3bcbad7a2ab4e8
Author: Mark Payne <markap14@hotmail.com>
Date:   Fri Jan 30 13:01:00 2015 -0500

    Load Controller Services from flow.tar file instead and external file

commit 52149d8510d8c517063bfd6359bde3950862db77
Author: Mark Payne <markap14@hotmail.com>
Date:   Fri Jan 30 12:44:30 2015 -0500

    NIFI-250: Change Availability to just NODE or NCM; update NCM to store controller services and reporting tasks in separate entries in tar file instead of in flow.xml

commit 3102e08378b34cb869c708faa05c427de6b68139
Author: Mark Payne <markap14@hotmail.com>
Date:   Fri Jan 30 10:18:54 2015 -0500

    NIFI-250: Updated ControllerServiceProvider to have a 'createControllerService' that takes no identifier and randomly generates one

commit 3344cef3365dfc620f11aaf18fcfc8ba7d58e16a
Author: Mark Payne <markap14@hotmail.com>
Date:   Fri Jan 30 09:05:58 2015 -0500

    NIFI-250: Updated controller services to use appropriate defaults and use .identifiesControllerService instead of using the old way of obtaining controller services; do not fail to startup if controller service is invalid

commit 1682e47aa3820bca6ec80e6009a16d0572fb1a9b
Merge: fbc14e0 e7beef8
Author: Mark Payne <markap14@hotmail.com>
Date:   Fri Jan 30 08:36:55 2015 -0500

    Merge branch 'NIFI-250' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250

commit 2de754a11af2f3d545ae9358c06dd6838e3d920c
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Jan 30 08:35:18 2015 -0500

    NIFI-250:
    - Showing controller service validation errors.

commit 600f8f7869161b50dc9939401ce8a91a64e3462a
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Jan 30 07:46:47 2015 -0500

    NIFI-250:
    - Adding support to go to a controller service.

commit e7beef8d224797c057650787c4041b15dbef87af
Merge: 1ebaf1d bafa945
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Jan 30 07:22:25 2015 -0500

    Merge branch 'develop' into NIFI-250

commit fbc14e0a3a46c0511d6135e86797cfc14c81d7d5
Merge: 9a6acab 1ebaf1d
Author: Mark Payne <markap14@hotmail.com>
Date:   Thu Jan 29 16:26:08 2015 -0500

    Merge branch 'NIFI-250' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250

commit 1ebaf1d29c7294b07f68def9d463c791f6d68cf9
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Thu Jan 29 13:06:54 2015 -0500

    NIFI-250:
    - Addressing the border visibility when toggling a reference block.

commit b98a7220c04582ad7305429ddee850096c2139cd
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Thu Jan 29 12:56:15 2015 -0500

    NIFI-250:
    - Showing components that reference a given controller service.

commit 9a6acab3734fbbb670fb5db2388ac85ef9b6fc6d
Author: Mark Payne <markap14@hotmail.com>
Date:   Thu Jan 29 11:24:56 2015 -0500

    NIFI-250: Do not try to load controller services and reporting tasks from old .xml files because they are now in flow.xml

commit 60ad998153f6c391f4a36f25b91629bde7d3e98b
Author: Mark Payne <markap14@hotmail.com>
Date:   Thu Jan 29 11:24:11 2015 -0500

    NIFI-250: Load Controller Services before processors or reporting tasks on restart

commit cfaafa3c291bbbe1009c10c10204befea0482bbe
Merge: 52d329c 4737a41
Author: Mark Payne <markap14@hotmail.com>
Date:   Thu Jan 29 10:55:09 2015 -0500

    Merge branch 'NIFI-250' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250

commit 4737a41a9ce7de540c7dce1d19e54802ce9127a9
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Thu Jan 29 10:51:18 2015 -0500

    NIFI-250:
    - Addressing some issues with reloading controller services on restart.
    - Starting to add the controller service references to the dialog.
    - Reloading processors and controller services before configuration to ensure their property descriptors are current.

commit 52d329ca036e059f50a169b726f4c202859ed0e1
Author: Mark Payne <markap14@hotmail.com>
Date:   Thu Jan 29 10:02:15 2015 -0500

    NIFI-250: Restore appropriate reporting task id on restart

commit 59f5b95c3ac3b1660da35aec63c22b23347a5aa3
Author: Mark Payne <markap14@hotmail.com>
Date:   Thu Jan 29 09:56:55 2015 -0500

    NIFI-250: Restore Controller Service using appropriate ID on restart

commit d60710b6fbbddc8bb1b6d8f5a7b078bbf7e4bd0a
Merge: f18aca1 bb628b0
Author: Mark Payne <markap14@hotmail.com>
Date:   Thu Jan 29 09:05:57 2015 -0500

    Merge branch 'NIFI-250' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250

commit f18aca1e0a6a701b9390cbe80e131296fbcbc7e7
Author: Mark Payne <markap14@hotmail.com>
Date:   Thu Jan 29 09:05:43 2015 -0500

    NIFI-250: Fixed bug where validator returns controller service identifier instead of name in description. Fixed bug where controller serivce references are not updated when property is removed from processor/service/reporting task

commit 31caadb20a85c2afa53969b1bd60f1979e1f004f
Author: Mark Payne <markap14@hotmail.com>
Date:   Thu Jan 29 08:49:44 2015 -0500

    NIFI-250: Fixed bug that caused IllegalStateException if property not set on controller service or reporting task

commit bb628b07a905ddb7b6dbf0c7c216d00627f82668
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Jan 28 15:55:00 2015 -0500

    NIFI-250:
    - Adding support for showing property history for controller services.

commit 0d1f80f22ecae9d8c5cc63fb7224ac551c0571d2
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Jan 28 15:54:26 2015 -0500

    NIFI-250:
    - Adding support for showing property history for controller services.

commit 5f571be29a4d934ec65701093dcc67964664b3f7
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Jan 28 15:02:02 2015 -0500

    NIFI-250:
    - Allowing read only users to view the controller settings (including controller services and reporting tasks).

commit 4564a137cbd929b7620c1008a1fc14fa60680421
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Jan 28 14:28:47 2015 -0500

    NIFI-250:
    - Showing refresh notice in the settings tab when the flow changes externally (another user).

commit c9d9d3199a40b602f1dfb2ccc532c264b4e223ab
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Jan 28 13:13:36 2015 -0500

    NIFI-250:
    - Auditing controller service actions.

commit 0aee34c287c28a01022f23a8a5809de489282734
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Jan 28 12:40:02 2015 -0500

    NIFI-250:
    - Auditing controller service actions.

commit d90e9d6a7203db4e612ca27fb2567dd2b92c8d88
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Jan 28 10:51:36 2015 -0500

    NIFI-250:
    - Documentation.
    - Prepping the list of controller service references.

commit 6581eb1360902225312d532c07b86343df175bc5
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Jan 28 10:32:15 2015 -0500

    NIFI-250:
    - Including the controller service references.

commit 68583ab90a50f5929859144326dc105cc4753acd
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Jan 28 09:36:34 2015 -0500

    NIFI-250:
    - Fixing the NODE_ONLY value.

commit e06e423ff191696f0ab2a081434ac7b26e183b91
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Jan 28 09:30:33 2015 -0500

    NIFI-250:
    - Only showing the availability field when clustered.

commit 91aa952f017dac0bf8cb1597ec3440f9bd8cda7a
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Jan 28 09:24:27 2015 -0500

    NIFI-250:
    - Adding support to enable/disable controller services through the actions in the table.

commit 5d5cb8f106c630e92852cf0fdefdad1c602c4520
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Jan 28 08:35:17 2015 -0500

    NIFI-250:
    - Wiring up updating and deleting controller services.
    - Ensuring the new property dialog is closed when clearing the grid.

commit 2303570eb68da63ebbd3a438555e3f523ec7308d
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Jan 28 08:33:42 2015 -0500

    NIFI-250:
    - Adding parameters to the update controller service endpoint.

commit 593afddaf0d1a0746064ad0cf3b74a7b06dc7031
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Jan 27 16:21:41 2015 -0500

    NIFI-250:
    - Documentation.
    - Updating how actions are triggered in the controller service table.

commit cf188ebc838ba3f0c26ae14c30e73b8a33510735
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Jan 27 16:20:35 2015 -0500

    NIFI-250:
    - Starting to implement the controller service DAO.

commit 526e18d00a1bdf8a63ebc70fd257ea23bf678425
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Jan 27 15:20:01 2015 -0500

    NIFI-250:
    - Using the property table plugin in the read only processor details dialog.
    - Clean up.

commit 2d7c700d173e757ca51b7b9832c9b385a67061c5
Merge: ec082f1 ea17dbe
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Jan 27 13:53:02 2015 -0500

    Merge branch 'NIFI-250' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250

commit ec082f1eead6b37e3b26e579f958cc0cde154d22
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Jan 27 13:52:42 2015 -0500

    NIFI-250:
    - Creating a jQuery plugin for rendering a table of properties (since we now want to configure processors, controller services, and reporting tasks).

commit 5785198f66c2d3d2aa17767a8941f194afc5638b
Author: Mark Payne <markap14@hotmail.com>
Date:   Tue Jan 27 09:56:50 2015 -0500

    NIFI-250: Removed TODO comment that was completed

commit ea17dbec6e1b4384c91fab9e54e30b29c6190c8d
Author: Mark Payne <markap14@hotmail.com>
Date:   Tue Jan 27 09:48:45 2015 -0500

    NIFI-250: Renamed 'getComment' and 'setComment' in ControllerServiceNode and ReportingTaskNode to 'getComments' and 'setComments' to be more consistent with how naming throughout the rest of the app

commit f14a34f6686621501ddcc68efbcc64f001c96ab8
Author: Mark Payne <markap14@hotmail.com>
Date:   Tue Jan 27 09:22:40 2015 -0500

    NIFI-250: Updated flow.xml schema to take reporting tasks and controller services into account; removed schemas for reporting tasks and controller services.

commit 24b4f1cf1109af53d6fd94d81fe81141e7dd0423
Merge: 4de0fd0 cb84829
Author: Mark Payne <markap14@hotmail.com>
Date:   Tue Jan 27 08:36:57 2015 -0500

    Merge branch 'NIFI-250' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250

commit cb84829b31cd709cedf866ac41854c3a2e74a158
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Jan 27 08:29:50 2015 -0500

    NIFI-250:
    - Renaming comment to comments.
    - Ensuring type is included in DTO and create request.

commit 4de0fd02678ce13d5a8b08edbc35a677560ded4d
Author: Mark Payne <markap14@hotmail.com>
Date:   Mon Jan 26 19:05:31 2015 -0500

    NIFI-250: Only run controller services and reporting tasks on the nodes/ncm according to their Availability

commit 2df4500c05ac91d46614e9ca41974fed890d2646
Author: Mark Payne <markap14@hotmail.com>
Date:   Mon Jan 26 15:17:04 2015 -0500

    NIFI-250: Implemented fingerprinting and reloading of controller services and reporting tasks from flow.xml

commit 86d15f9e1c3b28a9ae587a1cb0c73cd2b6e8b51c
Author: Mark Payne <markap14@hotmail.com>
Date:   Mon Jan 26 13:55:55 2015 -0500

    NIFI-250: Serialize and deserialize controller services and reporting tasks in the flow.xml

commit ff43b039085c56bb5f53148e25878ad71972a3db
Merge: 7a3d208 2da5792
Author: Mark Payne <markap14@hotmail.com>
Date:   Mon Jan 26 11:53:17 2015 -0500

    NIFI-250: Merged changes

commit 7a3d208f031122ab13349ace8aeafac9fe5c54ac
Author: Mark Payne <markap14@hotmail.com>
Date:   Mon Jan 26 11:42:01 2015 -0500

    NIFI-250: Allow Controller Services to be created without id and properties; allow controller service lookup to provide name of controller service given an id

commit 80f02e47256590c57a811b79040b70c827e71ff2
Author: Mark Payne <markap14@hotmail.com>
Date:   Mon Jan 26 10:31:06 2015 -0500

    Added Eclipse-specific files to .gitignore

commit 2da57924286fe1f9ae320e270ba0aba77a08d8b7
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Jan 26 09:39:14 2015 -0500

    NIFI-250:
    - Ensuring the tables are resized when appropriate.

commit 1854ebed22387d0f1a82bd9c52ab1ab5ae5c7e21
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Jan 26 09:38:59 2015 -0500

    NIFI-250:
    - Fixing NPE in stubbed out method.

commit 3e77e7d32e2c4e39a8247eacb44681a57bc3b618
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Jan 26 09:29:34 2015 -0500

    NIFI-250:
    - Supporting updated API.

commit e989215fa539f61eba7c915d1b04adebcc771c69
Merge: 0c021c7 6b560b9
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Jan 26 09:19:12 2015 -0500

    Merge branch 'develop' into NIFI-250

commit 0c021c782589b4fe439dcb0f81d229fde6cd9327
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Jan 26 09:18:06 2015 -0500

    NIFI-250:
    - Starting to load the controller services and prepare for adding them.

commit 35616e9ad64cd2985cf2e2cd1a2aa5fce33d980d
Merge: 6622317 33cee9d
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Jan 26 07:15:00 2015 -0500

    Merge branch 'develop' into NIFI-250

commit 6622317c1bcfb6b0a8f15cd1889fd644b2264a3a
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Jan 23 10:54:34 2015 -0500

    NIFI-250:
    - Adding a field to collect the controller service name during creation.

commit cb4c654c7f244ee7222fb444ccca096b8f56e164
Merge: e604caf 43e646e
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Jan 23 09:30:27 2015 -0500

    Merge branch 'develop' into NIFI-250

commit e604cafe79f5a90e9179a9f2e46e3cbbb7f47380
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Thu Jan 22 15:24:17 2015 -0500

    NIFI-250:
    - Adding an endpoint to manage ControllerServices.

commit c8ea6830672350e1469a21eeda2ce02a6f6236ac
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Jan 21 08:03:15 2015 -0500

    NIFI-250:
    - Moving files into the appropriate renamed directories.

commit f2b9f2c8d418d14fd982d721ccbb6b2bb0874de1
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Jan 21 08:02:50 2015 -0500

    NIFI-250:
    - Moving files into the appropriate renamed directories.

commit c5d452c1435d3d32df3da4100ca740ca372adb3d
Merge: e8d2bbf cff8b0d
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Jan 21 07:37:09 2015 -0500

    Merge branch 'develop' into NIFI-250

commit e8d2bbfe3c286fc21dea04e993771985d843b6e6
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Jan 20 13:35:18 2015 -0500

    NIFI-250:
    - Making the new controller services table collapsible.
    - Addressing issues with filtering, rollup, tags, and collapsing.

commit 4836385628b5622aa77c8adacd3a5241f8ee1829
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Jan 20 12:28:41 2015 -0500

    NIFI-250:
    - Ensuring the entire hierarchy is returned for each service type.

commit 66bd61e07bff17ddf7d672088e13d0b01bbfc96f
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Jan 20 08:40:37 2015 -0500

    Merge branch 'NIFI-250' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250

    Conflicts:
    	nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java
    	nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java

commit 1392f328c905a7919d2555767cb53395409e3e1e
Merge: 39a77e4 b29b61a
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Jan 20 08:34:05 2015 -0500

    Merge branch 'NIFI-250' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250

    Conflicts:
    	nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java
    	nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java

commit 39a77e4828e41f635f2f85c68b78ca9e21ad1970
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Jan 13 14:52:23 2015 -0500

    NIFI-250:
    - Creating endpoints for returning the available controller services and reporting tasks.
    - Made the Setting tabbed to provide a place for configuring controller services and reporting tasks.

commit 58b02e41eec54b1eff86a90205ab69f007ad1b00
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Jan 16 12:02:33 2015 -0500

    NIFI-250: merging from develop

commit b204688bfa738c47bed71a1aab6c46171b21107f
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Jan 16 11:59:51 2015 -0500

    NIFI-250:
    - Starting to making the available controller services collapsible. Still need to clean up and handle selection properly.

commit b39fdbd6052adf342f72f44764145a3564669920
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Jan 13 14:52:23 2015 -0500

    NIFI-250:
    - Creating endpoints for returning the available controller services and reporting tasks.
    - Made the Setting tabbed to provide a place for configuring controller services and reporting tasks.

    NIFI-250:
    - Extracting the tagcloud into a re-usable jQuery plugin.

    NIFI-250:
    - Creating a new controller service dialog. Dialog may be refactored into a reusable widget if possible.
    - Loading the new controller service dialog with all available controller services.
    - Fixing typos.

commit b29b61a5a8290b1b0a5513786227d7036e37aa6b
Merge: 8976ff4 bb108a0
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Mon Jan 19 13:15:03 2015 -0500

    Merge branch 'NIFI-250' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250

    Conflicts:
    	nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/settings-content.jsp
    	nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/settings.css
    	nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
    	nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java
    	nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java

commit 8976ff49834ad4116b0fe9425be00e86da74b1a7
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Jan 16 12:02:33 2015 -0500

    NIFI-250: merging from develop

commit 367baad5b6d9d633610e3547c75776338989f785
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Fri Jan 16 11:59:51 2015 -0500

    NIFI-250:
    - Starting to making the available controller services collapsible. Still need to clean up and handle selection properly.

commit 14da3f3de97f4b72afe591026c2690f92f4f7606
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Jan 13 14:52:23 2015 -0500

    NIFI-250:
    - Creating endpoints for returning the available controller services and reporting tasks.
    - Made the Setting tabbed to provide a place for configuring controller services and reporting tasks.

    NIFI-250:
    - Extracting the tagcloud into a re-usable jQuery plugin.

    NIFI-250:
    - Creating a new controller service dialog. Dialog may be refactored into a reusable widget if possible.
    - Loading the new controller service dialog with all available controller services.
    - Fixing typos.

commit bb108a0960d6095791afd367bee91e62d8d605da
Merge: da18ce0 03d422e
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Wed Jan 14 13:34:45 2015 -0500

    Merge branch 'NIFI-250' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250

commit da18ce0ab0fee2e497e65ff4af30dd8dac212e96
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Jan 13 14:52:23 2015 -0500

    NIFI-250:
    - Creating endpoints for returning the available controller services and reporting tasks.
    - Made the Setting tabbed to provide a place for configuring controller services and reporting tasks.

commit 03d422e4d4d65ebe4b080fc5ec88cc7aae30ae82
Author: Matt Gilman <matt.c.gilman@gmail.com>
Date:   Tue Jan 13 14:52:23 2015 -0500

    NIFI-250:
    - Creating endpoints for returning the available controller services and reporting tasks.
    - Made the Setting tabbed to provide a place for configuring controller services and reporting tasks.
2015-03-31 16:45:05 -04:00
Mark Payne 509933f631 NIFI-478: Fixed bug that caused byte sequence to be dropped for last split under certain circumstances; added new unit tests 2015-03-31 08:34:23 -04:00
Brandon DeVries e7d6d94584 Merge branch 'rep3' into develop 2015-03-30 12:14:20 -04:00
Brandon DeVries ac409fd69a NIFI-424
Processors / Controller Services should not be able to directly call ControllerService.initialize and ControllerService.onPropertyModified
2015-03-30 12:11:15 -04:00
Jenn Barnabee ed5fd733d8 NIFI-422 Updated Clustering Configuration section to account for some missing details; added short troubleshooting section.
Signed-off-by: joewitt <joewitt@apache.org>
2015-03-30 08:55:28 -04:00
Brian Ghigiarelli 878e950acc Adding HTML support to the PutEmail service by allowing the content mime type to be configurable with a PropertyDescriptor
Signed-off-by: Mark Payne <markap14@hotmail.com>
2015-03-27 15:16:37 -04:00
Mark Payne 909ded32aa NIFI-443: Fixed out-of-date comments/documentation 2015-03-27 15:06:11 -04:00
Mark Payne 42a4f90242 NIFI-443: If a funnel is given an incoming connection but has no outgoing connection, it continually runs and fails, logging a lot of ERROR messages 2015-03-27 14:46:20 -04:00
bbende 23989609ae Addressing feedback from pull request, adding commitWithin parameter to PutSolrContentStream since all update handlers support it 2015-03-26 22:27:09 -04:00