Repository: nifi
Updated Branches:
  refs/heads/master 22342a0e0 -> def9741a3


NIFI-5180: update JMS additional details to set Destination Type to Required, 
default 'QUEUE'

Signed-off-by: Pierre Villard <pierre.villard...@gmail.com>

This closes #2694.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/def9741a
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/def9741a
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/def9741a

Branch: refs/heads/master
Commit: def9741a3986db954fcb8f0c99445e47c63f3ad9
Parents: 22342a0
Author: Mark Bean <mark.o.b...@gmail.com>
Authored: Wed May 9 20:24:19 2018 -0400
Committer: Pierre Villard <pierre.villard...@gmail.com>
Committed: Thu May 10 10:47:20 2018 +0200

----------------------------------------------------------------------
 .../org/apache/nifi/jms/processors/AbstractJMSProcessor.java     | 2 +-
 .../additionalDetails.html                                       | 4 ++--
 .../additionalDetails.html                                       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/def9741a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java
----------------------------------------------------------------------
diff --git 
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java
 
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java
index 1b8a8f3..26a1f62 100644
--- 
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java
+++ 
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java
@@ -78,7 +78,7 @@ abstract class AbstractJMSProcessor<T extends JMSWorker> 
extends AbstractProcess
             .build();
     static final PropertyDescriptor DESTINATION_TYPE = new 
PropertyDescriptor.Builder()
             .name("Destination Type")
-            .description("The type of the JMS Destination. Could be one of 
'QUEUE' or 'TOPIC'. Usually provided by the administrator. Defaults to 'TOPIC")
+            .description("The type of the JMS Destination. Could be one of 
'QUEUE' or 'TOPIC'. Usually provided by the administrator. Defaults to 'QUEUE'")
             .required(true)
             .allowableValues(QUEUE, TOPIC)
             .defaultValue(QUEUE)

http://git-wip-us.apache.org/repos/asf/nifi/blob/def9741a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/resources/docs/org.apache.nifi.jms.processors.ConsumeJMS/additionalDetails.html
----------------------------------------------------------------------
diff --git 
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/resources/docs/org.apache.nifi.jms.processors.ConsumeJMS/additionalDetails.html
 
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/resources/docs/org.apache.nifi.jms.processors.ConsumeJMS/additionalDetails.html
index 52e2fed..8fcc0d7 100644
--- 
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/resources/docs/org.apache.nifi.jms.processors.ConsumeJMS/additionalDetails.html
+++ 
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/resources/docs/org.apache.nifi.jms.processors.ConsumeJMS/additionalDetails.html
@@ -46,8 +46,8 @@
     <li><b>Destination Name</b> - [REQUIRED] the name of the 
<i>javax.jms.Destination</i>. 
     Usually provided by administrator (e.g., 'topic://myTopic'). 
     </li>
-    <li><b>Destination Type</b> - [OPTIONAL] the type of the 
<i>javax.jms.Destination</i>. Could be one of 'QUEUE' or 'TOPIC'
-    Usually provided by the administrator. Defaults to 'TOPIC'. 
+    <li><b>Destination Type</b> - [REQUIRED] the type of the 
<i>javax.jms.Destination</i>. Could be one of 'QUEUE' or 'TOPIC'
+    Usually provided by the administrator. Defaults to 'QUEUE'.
     </li>
     <li><b>Connection Factory Service</b> - [REQUIRED] link to a 
pre-configured instance of org.apache.nifi.jms.cf.JMSConnectionFactoryProvider.
     </li>

http://git-wip-us.apache.org/repos/asf/nifi/blob/def9741a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/resources/docs/org.apache.nifi.jms.processors.PublishJMS/additionalDetails.html
----------------------------------------------------------------------
diff --git 
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/resources/docs/org.apache.nifi.jms.processors.PublishJMS/additionalDetails.html
 
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/resources/docs/org.apache.nifi.jms.processors.PublishJMS/additionalDetails.html
index 1f381e2..6bad536 100644
--- 
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/resources/docs/org.apache.nifi.jms.processors.PublishJMS/additionalDetails.html
+++ 
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/resources/docs/org.apache.nifi.jms.processors.PublishJMS/additionalDetails.html
@@ -49,8 +49,8 @@
     <li><b>Destination Name</b> - [REQUIRED] the name of the 
<i>javax.jms.Destination</i>. 
     Usually provided by administrator (e.g., 'topic://myTopic'). 
     </li>
-    <li><b>Destination Type</b> - [OPTIONAL] the type of the 
<i>javax.jms.Destination</i>. Could be one of 'QUEUE' or 'TOPIC'
-    Usually provided by the administrator. Defaults to 'TOPIC'. 
+    <li><b>Destination Type</b> - [REQUIRED] the type of the 
<i>javax.jms.Destination</i>. Could be one of 'QUEUE' or 'TOPIC'
+    Usually provided by the administrator. Defaults to 'QUEUE'.
     </li>
     <li><b>Connection Factory Service</b> - [REQUIRED] link to a 
pre-configured instance of org.apache.nifi.jms.cf.JMSConnectionFactoryProvider.
     </li>

Reply via email to