You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2015/02/23 13:36:19 UTC
[1/4] incubator-nifi git commit: NIFI-344 - Validating remote process
group URI in the backend
Repository: incubator-nifi
Updated Branches:
refs/heads/develop 57b5d589a -> 42f69196c
NIFI-344 - Validating remote process group URI in the backend
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/09090825
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/09090825
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/09090825
Branch: refs/heads/develop
Commit: 09090825dea376abd5a4c962fa2034e952b7dca1
Parents: dde5fd5
Author: danbress <db...@onyxconsults.com>
Authored: Tue Feb 17 12:39:20 2015 -0500
Committer: danbress <db...@onyxconsults.com>
Committed: Tue Feb 17 12:39:20 2015 -0500
----------------------------------------------------------------------
.../org/apache/nifi/web/api/RemoteProcessGroupResource.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/09090825/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/RemoteProcessGroupResource.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/RemoteProcessGroupResource.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/RemoteProcessGroupResource.java
index 6a5b536..3ddebd1 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/RemoteProcessGroupResource.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/RemoteProcessGroupResource.java
@@ -370,6 +370,10 @@ public class RemoteProcessGroupResource extends ApplicationResource {
if (uri.getScheme() == null || uri.getHost() == null) {
throw new IllegalArgumentException("The specified remote process group URL is malformed: " + requestProcessGroupDTO.getTargetUri());
}
+
+ if (!(uri.getScheme().equalsIgnoreCase("http") || uri.getScheme().equalsIgnoreCase("https"))) {
+ throw new IllegalArgumentException("The specified remote process group URL is invalid, only http and https are supported: " + requestProcessGroupDTO.getTargetUri());
+ }
// normalize the uri to the other controller
String controllerUri = uri.toString();
@@ -860,6 +864,10 @@ public class RemoteProcessGroupResource extends ApplicationResource {
if (uri.getScheme() == null || uri.getHost() == null) {
throw new IllegalArgumentException("The specified remote process group URL is malformed: " + requestRemoteProcessGroup.getTargetUri());
}
+
+ if (!(uri.getScheme().equalsIgnoreCase("http") || uri.getScheme().equalsIgnoreCase("https"))) {
+ throw new IllegalArgumentException("The specified remote process group URL is invalid, only http and https are supported: " + requestRemoteProcessGroup.getTargetUri());
+ }
// normalize the uri to the other controller
String controllerUri = uri.toString();
[2/4] incubator-nifi git commit: NIFI-344 - Defaulting new Remote
Process Group value
Posted by mc...@apache.org.
NIFI-344 - Defaulting new Remote Process Group value
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/10b5b3c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/10b5b3c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/10b5b3c9
Branch: refs/heads/develop
Commit: 10b5b3c90702115698b9d88180a806a44e96dda1
Parents: 0909082
Author: danbress <db...@onyxconsults.com>
Authored: Wed Feb 18 21:55:47 2015 -0500
Committer: danbress <db...@onyxconsults.com>
Committed: Wed Feb 18 21:55:47 2015 -0500
----------------------------------------------------------------------
.../WEB-INF/partials/canvas/new-remote-process-group-dialog.jsp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/10b5b3c9/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-remote-process-group-dialog.jsp
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-remote-process-group-dialog.jsp b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-remote-process-group-dialog.jsp
index d682c39..1c230da 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-remote-process-group-dialog.jsp
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-remote-process-group-dialog.jsp
@@ -20,7 +20,7 @@
<div class="setting">
<div class="setting-name">URL</div>
<div class="setting-field">
- <input id="new-remote-process-group-uri" type="text"/>
+ <input id="new-remote-process-group-uri" type="text" placeholder="https://"/>
</div>
</div>
</div>
[3/4] incubator-nifi git commit: NIFI-344 improving error message,
and setting a placeHolder for the field
Posted by mc...@apache.org.
NIFI-344 improving error message, and setting a placeHolder for the
field
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/750c4ebb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/750c4ebb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/750c4ebb
Branch: refs/heads/develop
Commit: 750c4ebb6c1d2f91e408ae7d8cbaf252cbcef30a
Parents: 10b5b3c
Author: danbress <db...@onyxconsults.com>
Authored: Thu Feb 19 18:15:29 2015 -0500
Committer: danbress <db...@onyxconsults.com>
Committed: Thu Feb 19 18:54:44 2015 -0500
----------------------------------------------------------------------
.../java/org/apache/nifi/web/api/RemoteProcessGroupResource.java | 4 ++--
.../WEB-INF/partials/canvas/new-remote-process-group-dialog.jsp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/750c4ebb/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/RemoteProcessGroupResource.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/RemoteProcessGroupResource.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/RemoteProcessGroupResource.java
index 3ddebd1..27fa292 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/RemoteProcessGroupResource.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/RemoteProcessGroupResource.java
@@ -372,7 +372,7 @@ public class RemoteProcessGroupResource extends ApplicationResource {
}
if (!(uri.getScheme().equalsIgnoreCase("http") || uri.getScheme().equalsIgnoreCase("https"))) {
- throw new IllegalArgumentException("The specified remote process group URL is invalid, only http and https are supported: " + requestProcessGroupDTO.getTargetUri());
+ throw new IllegalArgumentException("The specified remote process group URL is invalid because it is not http or https: " + requestProcessGroupDTO.getTargetUri());
}
// normalize the uri to the other controller
@@ -866,7 +866,7 @@ public class RemoteProcessGroupResource extends ApplicationResource {
}
if (!(uri.getScheme().equalsIgnoreCase("http") || uri.getScheme().equalsIgnoreCase("https"))) {
- throw new IllegalArgumentException("The specified remote process group URL is invalid, only http and https are supported: " + requestRemoteProcessGroup.getTargetUri());
+ throw new IllegalArgumentException("The specified remote process group URL is invalid because it is not http or https: " + requestRemoteProcessGroup.getTargetUri());
}
// normalize the uri to the other controller
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/750c4ebb/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-remote-process-group-dialog.jsp
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-remote-process-group-dialog.jsp b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-remote-process-group-dialog.jsp
index 1c230da..a479384 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-remote-process-group-dialog.jsp
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-remote-process-group-dialog.jsp
@@ -20,7 +20,7 @@
<div class="setting">
<div class="setting-name">URL</div>
<div class="setting-field">
- <input id="new-remote-process-group-uri" type="text" placeholder="https://"/>
+ <input id="new-remote-process-group-uri" type="text" placeholder="https://remotehost:8080/nifi"/>
</div>
</div>
</div>
[4/4] incubator-nifi git commit: Merge branch 'NIFI-344' of
https://github.com/danbress/incubator-nifi into develop
Posted by mc...@apache.org.
Merge branch 'NIFI-344' of https://github.com/danbress/incubator-nifi into develop
This closes #29
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/42f69196
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/42f69196
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/42f69196
Branch: refs/heads/develop
Commit: 42f69196c2e9afff18b864a054a5e6e30d5fe351
Parents: 57b5d58 750c4eb
Author: Matt Gilman <ma...@gmail.com>
Authored: Mon Feb 23 07:24:39 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Mon Feb 23 07:24:39 2015 -0500
----------------------------------------------------------------------
.../org/apache/nifi/web/api/RemoteProcessGroupResource.java | 8 ++++++++
.../partials/canvas/new-remote-process-group-dialog.jsp | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------