You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ij...@apache.org on 2016/12/08 05:37:39 UTC
nifi git commit: NIFI-3138 - Adding urls, transport,
proxy settings to rpg portion of flow config xsd
Repository: nifi
Updated Branches:
refs/heads/master 6b82e25c7 -> 9ce0af22a
NIFI-3138 - Adding urls, transport, proxy settings to rpg portion of flow config xsd
This closes #1304.
Signed-off-by: Koji Kawamura <ij...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/9ce0af22
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/9ce0af22
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/9ce0af22
Branch: refs/heads/master
Commit: 9ce0af22afa1f6e2c1c75e31aa9740727054a287
Parents: 6b82e25
Author: Bryan Rosander <br...@apache.org>
Authored: Tue Dec 6 14:23:43 2016 -0500
Committer: Koji Kawamura <ij...@apache.org>
Committed: Thu Dec 8 14:37:07 2016 +0900
----------------------------------------------------------------------
.../src/main/resources/FlowConfiguration.xsd | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/9ce0af22/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/resources/FlowConfiguration.xsd
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/resources/FlowConfiguration.xsd b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/resources/FlowConfiguration.xsd
index adc83be..08038bd 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/resources/FlowConfiguration.xsd
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/resources/FlowConfiguration.xsd
@@ -196,10 +196,16 @@
<xs:element name="position" type="PositionType" />
<xs:element name="comment" type="xs:string" />
<xs:element name="url" type="xs:anyURI" />
+ <xs:element name="urls" type="xs:string" minOccurs="0" maxOccurs="1" />
<xs:element name="timeout" type="xs:string" />
<xs:element name="yieldPeriod" type="TimePeriod" minOccurs="0" maxOccurs="1" />
<xs:element name="transmitting" type="xs:boolean" />
-
+ <xs:element name="transportProtocol" type="xs:string" minOccurs="0" maxOccurs="1" />
+ <xs:element name="proxyHost" type="xs:string" minOccurs="0" maxOccurs="1" />
+ <xs:element name="proxyPort" type="xs:int" minOccurs="0" maxOccurs="1" />
+ <xs:element name="proxyUser" type="xs:string" minOccurs="0" maxOccurs="1" />
+ <xs:element name="proxyPassword" type="xs:string" minOccurs="0" maxOccurs="1" />
+
<!-- The input ports and output ports of the remote group may change without our knowledge; however,
they are persisted here because on a restart of NiFi, we need to have the Input & Output Ports' IDs
and associated names persisted so that we can attempt to connect to these ports -->