You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/01/29 15:06:06 UTC
[1/4] incubator-nifi git commit: NIFI-250: Removed TODO comment that
was completed
Repository: incubator-nifi
Updated Branches:
refs/heads/NIFI-250 bb628b07a -> d60710b6f
NIFI-250: Removed TODO comment that was completed
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/5785198f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/5785198f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/5785198f
Branch: refs/heads/NIFI-250
Commit: 5785198f66c2d3d2aa17767a8941f194afc5638b
Parents: ea17dbe
Author: Mark Payne <ma...@hotmail.com>
Authored: Tue Jan 27 09:56:50 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Tue Jan 27 09:56:50 2015 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/nifi/controller/FlowController.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5785198f/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
index a215938..297810b 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
@@ -2577,8 +2577,6 @@ public class FlowController implements EventAccess, ControllerServiceProvider, H
* @param serviceNode
*/
public void deactiveReferencingComponents(final ControllerServiceNode serviceNode) {
- // TODO: Should stop all Processors and Reporting Tasks, and then wait for them to
- // finish, rather than stopping & waiting serially.
final ControllerServiceReference reference = serviceNode.getReferences();
final Set<ConfiguredComponent> components = reference.getActiveReferences();
[3/4] incubator-nifi git commit: 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/repor
Posted by ma...@apache.org.
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
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/f18aca1e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/f18aca1e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/f18aca1e
Branch: refs/heads/NIFI-250
Commit: f18aca1e0a6a701b9390cbe80e131296fbcbc7e7
Parents: 31caadb
Author: Mark Payne <ma...@hotmail.com>
Authored: Thu Jan 29 09:05:43 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Thu Jan 29 09:05:43 2015 -0500
----------------------------------------------------------------------
.../org/apache/nifi/components/PropertyDescriptor.java | 2 +-
.../nifi/controller/AbstractConfiguredComponent.java | 10 ++++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f18aca1e/nifi/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java b/nifi/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
index ba0f7dc..a4c855b 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
@@ -144,7 +144,7 @@ public final class PropertyDescriptor implements Comparable<PropertyDescriptor>
final ControllerService controllerService = context.getControllerServiceLookup().getControllerService(input);
if (!context.getControllerServiceLookup().isControllerServiceEnabled(controllerService)) {
return new ValidationResult.Builder()
- .input(input)
+ .input(context.getControllerServiceLookup().getControllerServiceName(controllerService.getIdentifier()))
.subject(getName())
.valid(false)
.explanation("Controller Service " + controllerService + " is disabled")
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f18aca1e/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractConfiguredComponent.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractConfiguredComponent.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractConfiguredComponent.java
index ef4b72a..af65b41 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractConfiguredComponent.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractConfiguredComponent.java
@@ -149,6 +149,16 @@ public abstract class AbstractConfiguredComponent implements ConfigurableCompone
final PropertyDescriptor descriptor = component.getPropertyDescriptor(name);
String value = null;
if (!descriptor.isRequired() && (value = properties.remove(descriptor)) != null) {
+
+ if ( descriptor.getControllerServiceDefinition() != null ) {
+ if (value != null) {
+ final ControllerServiceNode oldNode = serviceProvider.getControllerServiceNode(value);
+ if (oldNode != null) {
+ oldNode.removeReference(this);
+ }
+ }
+ }
+
component.onPropertyModified(descriptor, value, null);
return true;
}
[4/4] incubator-nifi git commit: Merge branch 'NIFI-250' of
http://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250
Posted by ma...@apache.org.
Merge branch 'NIFI-250' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/d60710b6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/d60710b6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/d60710b6
Branch: refs/heads/NIFI-250
Commit: d60710b6fbbddc8bb1b6d8f5a7b078bbf7e4bd0a
Parents: f18aca1 bb628b0
Author: Mark Payne <ma...@hotmail.com>
Authored: Thu Jan 29 09:05:57 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Thu Jan 29 09:05:57 2015 -0500
----------------------------------------------------------------------
.../org/apache/nifi/admin/dao/ActionDAO.java | 6 +-
.../nifi/admin/dao/impl/StandardActionDAO.java | 60 +-
.../apache/nifi/admin/service/AuditService.java | 6 +-
.../admin/service/action/GetPreviousValues.java | 8 +-
.../service/impl/StandardAuditService.java | 4 +-
.../nifi/web/api/dto/ComponentHistoryDTO.java | 56 +
.../web/api/dto/ControllerConfigurationDTO.java | 18 +
.../nifi/web/api/dto/ControllerServiceDTO.java | 111 +-
.../nifi/web/api/dto/ProcessorHistoryDTO.java | 56 -
.../component/details/ComponentDetailsDTO.java | 2 +-
.../component/details/ExtensionDetailsDTO.java | 41 +
.../component/details/ProcessorDetailsDTO.java | 41 -
.../web/api/entity/ComponentHistoryEntity.java | 45 +
.../web/api/entity/ProcessorHistoryEntity.java | 45 -
.../java/org/apache/nifi/action/Component.java | 3 +-
.../component/details/ExtensionDetails.java | 34 +
.../component/details/ProcessorDetails.java | 34 -
.../nifi/audit/ControllerServiceAuditor.java | 355 +++++
.../org/apache/nifi/audit/FunnelAuditor.java | 8 +-
.../java/org/apache/nifi/audit/NiFiAuditor.java | 1 +
.../java/org/apache/nifi/audit/PortAuditor.java | 17 +-
.../apache/nifi/audit/ProcessGroupAuditor.java | 18 +-
.../org/apache/nifi/audit/ProcessorAuditor.java | 20 +-
.../apache/nifi/audit/RelationshipAuditor.java | 18 +-
.../nifi/audit/RemoteProcessGroupAuditor.java | 22 +-
.../org/apache/nifi/audit/SnippetAuditor.java | 13 +-
.../org/apache/nifi/web/NiFiServiceFacade.java | 8 +-
.../nifi/web/StandardNiFiServiceFacade.java | 11 +-
.../apache/nifi/web/StandardNiFiWebContext.java | 4 +-
.../nifi/web/api/ControllerServiceResource.java | 87 +-
.../apache/nifi/web/api/HistoryResource.java | 39 +-
.../org/apache/nifi/web/api/dto/DtoFactory.java | 35 +-
.../dao/impl/StandardControllerServiceDAO.java | 136 +-
.../src/main/resources/nifi-web-api-context.xml | 5 +
.../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 6 +-
.../main/resources/filters/canvas.properties | 5 +-
.../src/main/webapp/WEB-INF/pages/canvas.jsp | 4 +-
.../src/main/webapp/WEB-INF/pages/summary.jsp | 2 +
.../canvas/controller-service-configuration.jsp | 80 ++
.../canvas/new-controller-service-dialog.jsp | 7 -
.../canvas/new-processor-property-dialog.jsp | 34 -
.../partials/canvas/new-property-dialog.jsp | 34 +
.../partials/canvas/processor-configuration.jsp | 18 +-
.../partials/canvas/settings-content.jsp | 28 +-
.../WEB-INF/partials/processor-details.jsp | 4 -
.../nifi-web-ui/src/main/webapp/css/canvas.css | 1 +
.../css/controller-service-configuration.css | 131 ++
.../nifi-web-ui/src/main/webapp/css/dialog.css | 10 -
.../css/new-controller-service-dialog.css | 15 +-
.../main/webapp/css/processor-configuration.css | 152 ---
.../src/main/webapp/css/processor-details.css | 26 -
.../src/main/webapp/css/settings.css | 38 +
.../main/webapp/images/buttonNewProperty.png | Bin 590 -> 0 bytes
.../src/main/webapp/images/iconUndo.png | Bin 642 -> 0 bytes
.../jquery/propertytable/buttonNewProperty.png | Bin 0 -> 590 bytes
.../propertytable/jquery.propertytable.css | 177 +++
.../propertytable/jquery.propertytable.js | 1292 ++++++++++++++++++
.../js/jquery/tagcloud/jquery.tagcloud.js | 10 -
.../webapp/js/nf/canvas/nf-canvas-header.js | 55 +-
.../src/main/webapp/js/nf/canvas/nf-canvas.js | 13 +-
.../nf-controller-service-configuration.js | 435 ++++++
.../js/nf/canvas/nf-processor-configuration.js | 47 +-
.../nf-processor-property-combo-editor.js | 177 ---
.../canvas/nf-processor-property-nfel-editor.js | 207 ---
.../js/nf/canvas/nf-processor-property-table.js | 567 --------
.../canvas/nf-processor-property-text-editor.js | 212 ---
.../src/main/webapp/js/nf/canvas/nf-settings.js | 352 +++--
.../webapp/js/nf/history/nf-history-table.js | 2 +-
.../src/main/webapp/js/nf/nf-common.js | 66 +
.../main/webapp/js/nf/nf-processor-details.js | 348 +----
70 files changed, 3665 insertions(+), 2257 deletions(-)
----------------------------------------------------------------------
[2/4] incubator-nifi git commit: NIFI-250: Fixed bug that caused
IllegalStateException if property not set on controller service or reporting
task
Posted by ma...@apache.org.
NIFI-250: Fixed bug that caused IllegalStateException if property not set on controller service or reporting task
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/31caadb2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/31caadb2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/31caadb2
Branch: refs/heads/NIFI-250
Commit: 31caadb20a85c2afa53969b1bd60f1979e1f004f
Parents: 5785198
Author: Mark Payne <ma...@hotmail.com>
Authored: Thu Jan 29 08:49:44 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Thu Jan 29 08:49:44 2015 -0500
----------------------------------------------------------------------
.../controller/StandardFlowSynchronizer.java | 22 +++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/31caadb2/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
index 560c884..08176f7 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
@@ -352,10 +352,14 @@ public class StandardFlowSynchronizer implements FlowSynchronizer {
node.setDisabled(dto.getEnabled() != Boolean.TRUE);
node.setAnnotationData(dto.getAnnotationData());
- for ( final Map.Entry<String, String> property : dto.getProperties().entrySet() ) {
- node.setProperty(property.getKey(), property.getValue());
- }
-
+ for (final Map.Entry<String, String> entry : dto.getProperties().entrySet()) {
+ if (entry.getValue() == null) {
+ node.removeProperty(entry.getKey());
+ } else {
+ node.setProperty(entry.getKey(), entry.getValue());
+ }
+ }
+
if ( dto.getEnabled() == Boolean.TRUE ) {
controller.enableControllerService(node);
}
@@ -385,9 +389,13 @@ public class StandardFlowSynchronizer implements FlowSynchronizer {
reportingTask.setAnnotationData(dto.getAnnotationData());
- for ( final Map.Entry<String, String> entry : dto.getProperties().entrySet() ) {
- reportingTask.setProperty(entry.getKey(), entry.getValue());
- }
+ for (final Map.Entry<String, String> entry : dto.getProperties().entrySet()) {
+ if (entry.getValue() == null) {
+ reportingTask.removeProperty(entry.getKey());
+ } else {
+ reportingTask.setProperty(entry.getKey(), entry.getValue());
+ }
+ }
}
private void updateReportingTask(final FlowController controller, final Element reportingTaskElement, final StringEncryptor encryptor) {