You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2014/12/23 22:06:11 UTC
[1/3] incubator-nifi git commit: NIFI-51 fixed if/else logic/order
Repository: incubator-nifi
Updated Branches:
refs/heads/develop b569a9d78 -> 7f0eb2e35
NIFI-51 fixed if/else logic/order
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/c3944541
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/c3944541
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/c3944541
Branch: refs/heads/develop
Commit: c39445415779cc6c0f21b226ea41c23daf29f6d1
Parents: 1374d1d
Author: joewitt <jo...@apache.org>
Authored: Tue Dec 23 15:12:37 2014 -0500
Committer: joewitt <jo...@apache.org>
Committed: Tue Dec 23 15:12:37 2014 -0500
----------------------------------------------------------------------
.../main/java/org/apache/nifi/controller/FlowController.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c3944541/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
index e6d67a0..bb98418 100644
--- a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
+++ b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
@@ -447,10 +447,11 @@ public class FlowController implements EventAccess, ControllerServiceProvider, H
rootGroup.setName(DEFAULT_ROOT_GROUP_NAME);
instanceId = UUID.randomUUID().toString();
- if (Boolean.TRUE.equals(isSiteToSiteSecure) && sslContext == null) {
- LOG.error("Unable to create Secure Site-to-Site Listener because not all required Keystore/Truststore Properties are set. Site-to-Site functionality will be disabled until this problem is has been fixed.");
+ if (remoteInputSocketPort == null){
+ LOG.info("Not enabling Site-to-Site functionality because nifi.remote.input.socket.port is not set");
externalSiteListener = null;
- } else if (remoteInputSocketPort == null) {
+ } else if (isSiteToSiteSecure && sslContext == null) {
+ LOG.error("Unable to create Secure Site-to-Site Listener because not all required Keystore/Truststore Properties are set. Site-to-Site functionality will be disabled until this problem is has been fixed.");
externalSiteListener = null;
} else {
// Register the SocketFlowFileServerProtocol as the appropriate resource for site-to-site Server Protocol
[2/3] incubator-nifi git commit: Merge remote-tracking branch
'origin/develop' into develop
Posted by jo...@apache.org.
Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/ed3452f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/ed3452f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/ed3452f5
Branch: refs/heads/develop
Commit: ed3452f527aed01318b0a6611fbbe48239e8cb8c
Parents: c394454 b569a9d
Author: joewitt <jo...@apache.org>
Authored: Tue Dec 23 15:40:17 2014 -0500
Committer: joewitt <jo...@apache.org>
Committed: Tue Dec 23 15:40:17 2014 -0500
----------------------------------------------------------------------
.../apache/nifi/admin/service/UserService.java | 13 +
.../service/action/AuthorizeDownloadAction.java | 54 ++++
.../admin/service/impl/StandardUserService.java | 36 ++-
.../AuthorityProviderFactoryBean.java | 13 +
.../java/org/apache/nifi/user/NiFiUser.java | 10 +
.../impl/NiFiAuthorizationServiceTest.java | 284 -------------------
.../NodeAuthorizationProvider.java | 8 +
.../file-authorization-provider/pom.xml | 2 +-
.../FileAuthorizationProvider.java | 16 ++
.../apache/nifi/web/api/ProvenanceResource.java | 10 +-
.../nifi/web/controller/ControllerFacade.java | 30 ++
.../src/main/resources/nifi-web-api-context.xml | 1 +
.../util/NiFiTestAuthorizationProvider.java | 7 +
.../js/nf/provenance/nf-provenance-table.js | 107 ++++---
.../js/nf/templates/nf-templates-table.js | 2 +-
.../authorization/NiFiAuthorizationService.java | 35 ++-
.../NiFiAuthorizationServiceTest.java | 250 ++++++++++++++++
.../nifi/authorization/AuthorityProvider.java | 19 ++
.../authorization/DownloadAuthorization.java | 86 ++++++
19 files changed, 630 insertions(+), 353 deletions(-)
----------------------------------------------------------------------
[3/3] incubator-nifi git commit: NIFI-51 made a test a little nicer
about cleanup as it kept messing up the build and addressed the possible
NPE/ordering logic for 51
Posted by jo...@apache.org.
NIFI-51 made a test a little nicer about cleanup as it kept messing up the build and addressed the possible NPE/ordering logic for 51
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/7f0eb2e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/7f0eb2e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/7f0eb2e3
Branch: refs/heads/develop
Commit: 7f0eb2e35286b58a1072067599a88ca47af991a8
Parents: ed3452f
Author: joewitt <jo...@apache.org>
Authored: Tue Dec 23 16:05:43 2014 -0500
Committer: joewitt <jo...@apache.org>
Committed: Tue Dec 23 16:05:43 2014 -0500
----------------------------------------------------------------------
.../java/org/apache/nifi/util/NiFiProperties.java | 14 ++++++--------
.../flow/impl/DataFlowManagementServiceImplTest.java | 6 ++++--
2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7f0eb2e3/commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
----------------------------------------------------------------------
diff --git a/commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java b/commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
index 1520814..6fdc4c1 100644
--- a/commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
+++ b/commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
@@ -374,20 +374,18 @@ public class NiFiProperties extends Properties {
return getPropertyAsPort(REMOTE_INPUT_PORT, DEFAULT_REMOTE_INPUT_PORT);
}
+ /**
+ * @return False if property value is 'false'; True otherwise.
+ */
public Boolean isSiteToSiteSecure() {
- final String secureVal = getProperty(SITE_TO_SITE_SECURE);
- if (secureVal == null) {
- return null;
- }
+ final String secureVal = getProperty(SITE_TO_SITE_SECURE, "true");
- if ("true".equalsIgnoreCase(secureVal)) {
- return true;
- }
if ("false".equalsIgnoreCase(secureVal)) {
return false;
+ }else{
+ return true;
}
- throw new IllegalStateException("Property value for " + SITE_TO_SITE_SECURE + " is " + secureVal + "; expected 'true' or 'false'");
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7f0eb2e3/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/flow/impl/DataFlowManagementServiceImplTest.java
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/flow/impl/DataFlowManagementServiceImplTest.java b/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/flow/impl/DataFlowManagementServiceImplTest.java
index 6294dfc..f9ba016 100644
--- a/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/flow/impl/DataFlowManagementServiceImplTest.java
+++ b/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/flow/impl/DataFlowManagementServiceImplTest.java
@@ -74,8 +74,8 @@ public class DataFlowManagementServiceImplTest {
@Before
public void setup() throws IOException {
- primaryLocation = new File(System.getProperty("java.io.tmpdir") + "/primary");
- restoreLocation = new File(System.getProperty("java.io.tmpdir") + "/restore");
+ primaryLocation = new File(System.getProperty("java.io.tmpdir") + "/primary" + this.getClass().getSimpleName());
+ restoreLocation = new File(System.getProperty("java.io.tmpdir") + "/restore" + this.getClass().getSimpleName());
FileUtils.deleteDirectory(primaryLocation);
FileUtils.deleteDirectory(restoreLocation);
@@ -114,6 +114,8 @@ public class DataFlowManagementServiceImplTest {
ex.printStackTrace(System.out);
}
}
+ FileUtils.deleteDirectory(primaryLocation);
+ FileUtils.deleteDirectory(restoreLocation);
}