Added Java JMS selector syntax to client. Fixed pointers to Java JMS Client examples.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@927574 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 92 insertions, 3 deletions

diff --git a/qpid/doc/book/src/AMQP-Java-JMS-Messaging-Client.xml b/qpid/doc/book/src/AMQP-Java-JMS-Messaging-Client.xml
index 089e17c7f0..8c14d67e14 100644
--- a/qpid/doc/book/src/AMQP-Java-JMS-Messaging-Client.xml
+++ b/qpid/doc/book/src/AMQP-Java-JMS-Messaging-Client.xml
@@ -48,6 +48,7 @@ http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=qpid&title=J
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="System-Properties.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Connection-URL-Format.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Binding-URL-Format.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-JMS-Selector-Syntax.xml"/>
 
 <!--
             <listitem><para>How to Use JNDI to configure the AMQP Java JMS Client
@@ -66,15 +67,26 @@ http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=qpid&title=J
 
 	  <itemizedlist>
             <listitem><para>
-              <ulink url="https://svn.apache.org/repos/asf/qpid/trunk/qpid/java/client/example/"></ulink>
+              <ulink url="https://svn.apache.org/repos/asf/qpid/trunk/qpid/java/client/example/">Examples Directory</ulink>
             </para></listitem>
 
             <listitem><para>
-              <ulink url="https://svn.apache.org/repos/asf/qpid/trunk/qpid/java/client/example/"></ulink>
+              <ulink url="https://svn.apache.org/repos/asf/qpid/trunk/qpid/java/client/example/src/main/java/runSample.sh">Script for running examples</ulink>
             </para></listitem>
             <listitem><para>
-              <ulink url="https://svn.apache.org/repos/asf/qpid/trunk/qpid/java/client/example/"></ulink>
+              <ulink url="https://svn.apache.org/repos/asf/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/">Direct Example</ulink>
             </para></listitem>
+            <listitem><para>
+              <ulink url="https://svn.apache.org/repos/asf/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/">Fanout Example</ulink>
+            </para></listitem>
+            <listitem><para>
+              <ulink url="https://svn.apache.org/repos/asf/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub">Pub-Sub Example</ulink>
+            </para></listitem>
+            <listitem><para>
+              <ulink url="https://svn.apache.org/repos/asf/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/">Request/Response Example</ulink>
+            </para></listitem>
+	    <listitem><para>
+	      <ulink url="https://svn.apache.org/repos/asf/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/transacted/">Transacted Example</ulink></para></listitem>
           </itemizedlist>
 
 <!--h3--></section>
diff --git a/qpid/doc/book/src/Java-JMS-Selector-Syntax.xml b/qpid/doc/book/src/Java-JMS-Selector-Syntax.xml
new file mode 100644
index 0000000000..241fcc36ba
--- /dev/null
+++ b/qpid/doc/book/src/Java-JMS-Selector-Syntax.xml
@@ -0,0 +1,76 @@
+<section>
+  <title>Java JMS Selector Syntax</title>
+  <para>The AMQP Java JMS Messaging Client supports the following syntax for JMS selectors.</para>
+
+<programlisting><![CDATA[
+Comments:
+
+  LINE_COMMENT: "--" (~["\n","\r"])* EOL
+  EOL: "\n"|"\r"|"\r\n"
+  BLOCK_COMMENT: "/*" (~["*"])* "*" ("*" | (~["*","/"] (~["*"])* "*"))* "/"
+
+Reserved Words (case insensitive):
+
+  NOT:     "NOT"
+  AND:     "AND"
+  OR:      "OR"
+  BETWEEN: "BETWEEN"
+  LIKE:    "LIKE"
+  ESCAPE:  "ESCAPE"
+  IN:      "IN"
+  IS:      "IS"
+  TRUE:    "TRUE"
+  FALSE:   "FALSE"
+  NULL:    "NULL"
+
+Literals (case insensitive):
+
+  DECIMAL_LITERAL:        ["1"-"9"] (["0"-"9"])* (["l","L"])?
+  HEX_LITERAL:            "0" ["x","X"] (["0"-"9","a"-"f","A"-"F"])+
+  OCTAL_LITERAL:          "0" (["0"-"7"])*
+  FLOATING_POINT_LITERAL: (   (["0"-"9"])+ "." (["0"-"9"])* (<EXPONENT>)? // matches: 5.5 or 5. or 5.5E10 or 5.E10
+                            | "." (["0"-"9"])+ (<EXPONENT>)?              // matches: .5 or .5E10
+                            | (["0"-"9"])+ <EXPONENT> )                   // matches: 5E10
+  EXPONENT:               "E" (["+","-"])? (["0"-"9"])+
+  STRING_LITERAL:         "'" ( ("''") | ~["'"] )*  "'"
+
+Identifiers (case insensitive):
+
+  ID : ["a"-"z", "_", "$"] (["a"-"z","0"-"9","_", "$"])*
+  QUOTED_ID : "\"" ( ("\"\"") | ~["\""] )*  "\""
+
+Grammar:
+
+  JmsSelector          := orExpression
+  orExpression         := ( andExpression ( <OR> andExpression )* )
+  andExpression        := ( equalityExpression ( <AND> equalityExpression )* )
+  equalityExpression   := ( comparisonExpression (   "=" comparisonExpression
+                                                   | "<>" comparisonExpression
+                                                   | <IS> <NULL>
+                                                   | <IS> <NOT> <NULL> )* )
+  comparisonExpression := ( addExpression (   ">" addExpression
+                                            | ">=" addExpression
+                                            | "<" addExpression
+                                            | "<=" addExpression
+                                            | <LIKE> stringLitteral ( <ESCAPE> stringLitteral )?
+                                            | <NOT> <LIKE> <STRING_LITERAL> ( <ESCAPE> <STRING_LITERAL> )?
+                                            | <BETWEEN> addExpression <AND> addExpression
+                                            | <NOT> <BETWEEN> addExpression <AND> addExpression
+                                            | <IN> "(" <STRING_LITERAL> ( "," <STRING_LITERAL> )* ")"
+                                            | <NOT> <IN> "(" <STRING_LITERAL> ( "," <STRING_LITERAL> )* ")" )* )
+  addExpression        := multExpr ( ( "+" multExpr | "-" multExpr ) )*
+  multExpr             := unaryExpr ( "*" unaryExpr | "/" unaryExpr | "%" unaryExpr )*
+  unaryExpr            := ( "+" unaryExpr | "-" unaryExpr | <NOT> unaryExpr | primaryExpr )
+  primaryExpr          := ( literal | variable | "(" orExpression ")" )
+  literal              := (   <STRING_LITERAL>
+                            | <DECIMAL_LITERAL>
+                            | <HEX_LITERAL>
+                            | <OCTAL_LITERAL>
+                            | <FLOATING_POINT_LITERAL>
+                            | <TRUE>
+                            | <FALSE>
+                            | <NULL> )
+  variable             := ( <ID> | <QUOTED_ID> )
+]]></programlisting>
+
+</section>
\ No newline at end of file
diff --git a/qpid/doc/book/src/images/qpid-logo.png b/qpid/doc/book/src/images/qpid-logo.png
new file mode 100644
index 0000000000..5f4ccc3081
--- /dev/null
+++ b/qpid/doc/book/src/images/qpid-logo.png
diff --git a/qpid/doc/book/src/schemas.xml b/qpid/doc/book/src/schemas.xml
index 550481ca0a..3563398252 100644
--- a/qpid/doc/book/src/schemas.xml
+++ b/qpid/doc/book/src/schemas.xml
@@ -21,6 +21,7 @@
 -->
 
 <locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
+  <uri resource="Java-JMS-Selector-Syntax.xml" typeId="DocBook"/>
  <uri resource="ACL.xml" typeId="DocBook"/>
  <uri resource="Add-New-Users.xml" typeId="DocBook"/>
  <uri resource="AMQP-C++-Messaging-Client.xml" typeId="DocBook"/>