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:21 UTC
[3/4] incubator-nifi git commit: NIFI-344 improving error message,
and setting a placeHolder for the field
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>