Update from trunk r1375509 through r1450773asyncstore

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

4 files changed, 189 insertions, 1 deletions

diff --git a/java/client/example/src/main/java/org/apache/qpid/example/Drain.java b/java/client/example/src/main/java/org/apache/qpid/example/Drain.java
index 28e1d5a87e..f0eb83ad24 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/Drain.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/Drain.java
@@ -88,7 +88,7 @@ public class Drain extends OptionParser
                 }               
             }            
         }
-        
+        consumer.close();
         ssn.close();
         con.close();
     }
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/ListReceiver.java b/java/client/example/src/main/java/org/apache/qpid/example/ListReceiver.java
new file mode 100644
index 0000000000..b12cfab9de
--- /dev/null
+++ b/java/client/example/src/main/java/org/apache/qpid/example/ListReceiver.java
@@ -0,0 +1,101 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.qpid.example;
+
+import javax.jms.Connection;
+import javax.jms.Destination;
+import javax.jms.MapMessage;
+import javax.jms.StreamMessage;
+import javax.jms.MessageConsumer;
+import javax.jms.Session;
+import javax.jms.MessageEOFException;
+
+import org.apache.qpid.client.AMQAnyDestination;
+import org.apache.qpid.client.AMQConnection;
+
+import org.apache.qpid.jms.ListMessage;
+
+import java.util.Enumeration;
+import java.util.Iterator;
+
+public class ListReceiver {
+
+    public static void main(String[] args) throws Exception
+    {
+	if (args.length != 1) {
+		System.out.println("Usage: java org.apache.qpid.example.ListReceiver <-l | -m | -s>");
+		System.out.println("where:");
+		System.out.println("\t-l\tAccept ListMessage and print it");
+		System.out.println("\t-m\tAccept ListMessage as a MapMessage");
+		System.out.println("\t-s\tAccept ListMessage as a StreamMessage");
+		return;
+	}
+
+        Connection connection =
+            new AMQConnection("amqp://guest:guest@test/?brokerlist='tcp://localhost:5672'");
+
+        connection.start();
+
+        Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+        Destination queue = new AMQAnyDestination("ADDR:message_queue; {create: always}");
+        MessageConsumer consumer = session.createConsumer(queue);
+
+	if (args[0].equals("-l")) {
+		System.out.println("Receiving as ListMessage");
+        	ListMessage m = (ListMessage)consumer.receive();
+	        System.out.println(m);
+		System.out.println("==========================================");
+		System.out.println("Printing list contents:");
+		Iterator i = m.iterator();
+		while(i.hasNext())
+			System.out.println(i.next());
+	}
+	else if (args[0].equals("-m")) {
+		System.out.println("Receiving as MapMessage");
+        	MapMessage m = (MapMessage)consumer.receive();
+	        System.out.println(m);
+		System.out.println("==========================================");
+		System.out.println("Printing map contents:");
+		Enumeration keys = m.getMapNames();
+		while(keys.hasMoreElements()) {
+			String key = (String)keys.nextElement();
+			System.out.println(key + " => " + m.getObject(key));
+		}
+	}
+	else if (args[0].equals("-s")) {
+		System.out.println("Receiving as StreamMessage");
+        	StreamMessage m = (StreamMessage)consumer.receive();
+	        System.out.println(m);
+		System.out.println("==========================================");
+		System.out.println("Printing stream contents:");
+		try {
+			while(true)
+				System.out.println(m.readObject());
+		}
+		catch (MessageEOFException e) {
+			// DONE
+		}
+	}
+
+        connection.close();
+    }
+}
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/ListSender.java b/java/client/example/src/main/java/org/apache/qpid/example/ListSender.java
new file mode 100644
index 0000000000..fe2c1ec472
--- /dev/null
+++ b/java/client/example/src/main/java/org/apache/qpid/example/ListSender.java
@@ -0,0 +1,86 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.qpid.example;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.jms.Connection;
+import javax.jms.Destination;
+import javax.jms.Message;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+
+import org.apache.qpid.client.AMQAnyDestination;
+import org.apache.qpid.client.AMQConnection;
+
+import org.apache.qpid.jms.ListMessage;
+
+
+public class ListSender {
+
+    public static void main(String[] args) throws Exception
+    {
+        Connection connection =
+            new AMQConnection("amqp://guest:guest@test/?brokerlist='tcp://localhost:5672'");
+
+        Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+        Destination queue = new AMQAnyDestination("ADDR:message_queue; {create: always}");
+        MessageProducer producer = session.createProducer(queue);
+
+        ListMessage m = ((org.apache.qpid.jms.Session)session).createListMessage();
+        m.setIntProperty("Id", 987654321);
+        m.setStringProperty("name", "Widget");
+        m.setDoubleProperty("price", 0.99);
+
+        List<String> colors = new ArrayList<String>();
+        colors.add("red");
+        colors.add("green");
+        colors.add("white");
+        m.add(colors);
+
+        Map<String,Double> dimensions = new HashMap<String,Double>();
+        dimensions.put("length",10.2);
+        dimensions.put("width",5.1);
+        dimensions.put("depth",2.0);
+        m.add(dimensions);
+
+        List<List<Integer>> parts = new ArrayList<List<Integer>>();
+        parts.add(Arrays.asList(new Integer[] {1,2,5}));
+        parts.add(Arrays.asList(new Integer[] {8,2,5}));
+        m.add(parts);
+
+        Map<String,Object> specs = new HashMap<String,Object>();
+        specs.put("colours", colors);
+        specs.put("dimensions", dimensions);
+        specs.put("parts", parts);
+        m.add(specs);
+
+        producer.send((Message)m);
+	System.out.println("Sent: " + m);
+        connection.close();
+    }
+
+}
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/Spout.java b/java/client/example/src/main/java/org/apache/qpid/example/Spout.java
index 61ff2dfc19..09e813f8c1 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/Spout.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/Spout.java
@@ -100,6 +100,7 @@ public class Spout extends OptionParser
             System.out.println(msg);
             System.out.println("-------------------------------\n");
         }
+        producer.close();
         ssn.close();
         con.close();
     }