Merge PR #187 and #188

examples/core/embedded-remote/readme.html

@@ -33,7 +33,7 @@ under the License.
 
 
      <h2>Example step-by-step</h2>     
-     <p><i>To run the example, simply type <code>mvn -Pserver</code> from this directory to start the server and <code>mvn -Pclient</code> to run the client example</i></p>
+     <p><i>To run the example, simply type <code>mvn verify -Pserver</code> from this directory to start the server and <code>mvn verify -Pclient</code> to run the client example</i></p>
      <p>In this we don't use any configuration files. (Everything is embedded). We simply instantiate ConfigurationImpl, ActiveMQServer, start it and operate on JMS regularly</p>
      <br/>
      <ol>

examples/core/embedded/readme.html

@@ -38,7 +38,7 @@ under the License.
      <p>ActiveMQ Embedded could be used from very simple use cases with only InVM support to very complex cases with clustering, persistence and fail over.</p>
 
      <h2>Example step-by-step</h2>     
-     <p><i>To run the example, simply type <code>mvn -Pexample</code> from this directory</i></p>
+     <p><i>To run the example, simply type <code>mvn verify -Pexample</code> from this directory</i></p>
      <p>In this we don't use any configuration files. (Everything is embedded). We simply instantiate ConfigurationImpl, ActiveMQServer, start it and operate on JMS regularly</p>
 
      <ol>

examples/jms/proton-cpp/pom.xml

@@ -33,30 +33,14 @@ under the License.
 
    <dependencies>
       <dependency>
-         <groupId>org.apache.activemq</groupId>
+         <groupId>org.apache.activemq.examples.jms</groupId>
-         <artifactId>activemq-core-client</artifactId>
+         <artifactId>activemq-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
-      <dependency>
-         <groupId>org.apache.activemq</groupId>
-         <artifactId>activemq-commons</artifactId>
-         <version>${project.version}</version>
-      </dependency>
-      <dependency>
-         <groupId>io.netty</groupId>
-         <artifactId>netty-all</artifactId>
-         <version>${netty.version}</version>
-      </dependency>
       <dependency>
          <groupId>org.apache.geronimo.specs</groupId>
          <artifactId>geronimo-jms_2.0_spec</artifactId>
       </dependency>
-      <dependency>
-         <groupId>org.apache.activemq</groupId>
-         <artifactId>activemq-amqp-protocol</artifactId>
-         <version>${project.version}</version>
-      </dependency>
-
    </dependencies>
 
    <profiles>
@@ -67,6 +51,7 @@ under the License.
                <plugin>
                   <groupId>org.apache.activemq</groupId>
                   <artifactId>activemq-maven-plugin</artifactId>
+                  <version>${project.version}</version>
                   <executions>
                      <execution>
                         <id>start</id>
@@ -74,8 +59,6 @@ under the License.
                            <goal>start</goal>
                         </goals>
                         <configuration>
-                           <waitOnStart>true</waitOnStart>
-                           <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
                            <systemProperties>
                               <property>
                                  <name>data.dir</name>
@@ -84,12 +67,28 @@ under the License.
                            </systemProperties>
                         </configuration>
                      </execution>
+                     <execution>
+                        <id>runClient</id>
+                        <goals>
+                           <goal>runClient</goal>
+                        </goals>
+                        <configuration>
+                           <clientClass>org.apache.activemq.jms.example.ProtonCPPExample</clientClass>
+                        </configuration>
+                     </execution>
+                     <execution>
+                        <id>stop</id>
+                        <goals>
+                           <goal>stop</goal>
+                        </goals>
+                     </execution>
                   </executions>
-                  <configuration>
-                     <waitOnStart>false</waitOnStart>
-                     <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
-                  </configuration>
                   <dependencies>
+                     <dependency>
+                        <groupId>org.apache.activemq.examples.jms</groupId>
+                        <artifactId>activemq-jms-protoncpp</artifactId>
+                        <version>${project.version}</version>
+                     </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
                         <artifactId>activemq-core-client</artifactId>
@@ -121,15 +120,19 @@ under the License.
                         <version>${netty.version}</version>
                      </dependency>
                      <dependency>
-                         <groupId>org.apache.geronimo.specs</groupId>
+                        <groupId>org.apache.geronimo.specs</groupId>
-                         <artifactId>geronimo-jms_2.0_spec</artifactId>
+                        <artifactId>geronimo-jms_2.0_spec</artifactId>
+                        <version>${geronimo.jms.2.spec.version}</version>
                      </dependency>
                   </dependencies>
+                  <configuration>
+                     <waitOnStart>false</waitOnStart>
+                     <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
+                  </configuration>
                </plugin>
             </plugins>
          </build>
       </profile>
    </profiles>
 
-
 </project>

examples/jms/proton-cpp/src/main/java/org/apache/activemq/jms/example/ProtonCPPExample.java

@@ -0,0 +1,141 @@
+/**
+ * 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.activemq.jms.example;
+
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueRequestor;
+import javax.jms.QueueSession;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.naming.InitialContext;
+
+import org.apache.activemq.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.api.jms.ActiveMQJMSConstants;
+import org.apache.activemq.api.jms.management.JMSManagementHelper;
+
+import org.apache.activemq.common.example.ActiveMQExample;
+
+/**
+ * This example demonstrates the use of ActiveMQ "pre-acknowledge" functionality where
+ * messages are acknowledged before they are delivered to the consumer.
+ *
+ * Please see the readme.html for more details.
+ */
+public class ProtonCPPExample extends ActiveMQExample
+{
+   public static void main(final String[] args)
+   {
+      new ProtonCPPExample().run(args);
+   }
+
+   @Override
+   public boolean runExample() throws Exception
+   {
+      Connection connection = null;
+
+      InitialContext initialContext = null;
+      try
+      {
+         // Step 1. Create an initial context to perform the JNDI lookup.
+         initialContext = new InitialContext();
+
+         // Step 2. Perform the look-ups
+         Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
+
+         ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("ConnectionFactory");
+
+         // Step 3. Create a the JMS objects
+         connection = cf.createConnection();
+
+         Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+         MessageConsumer messageConsumer = session.createConsumer(queue);
+         
+         MessageProducer producerAnswer = session.createProducer(queue);
+
+         // Step 4. Start the connection
+         connection.start();
+
+         System.out.println("On a shell script, execute the following:");
+
+         System.out.println("./compile.sh");
+
+         System.out.println("./hello");
+
+         // Step 5. Finally, receive the message
+         Message messageReceived = messageConsumer.receive(5000);
+
+         if (messageReceived == null)
+         {
+            // We are not going to issue this as an error because 
+            // we also use this example as part of our tests on activemq6
+            // this is not considered an error, just that no messages arrived (i.e. hello wasn't called)
+         }
+         else
+         {
+            System.out.println("message received: " + messageReceived);
+            
+            // Sending message back to client
+            producerAnswer.send(session.createTextMessage("HELLO from Apache ActiveMQ"));
+         }
+
+         return true;
+      }
+      finally
+      {
+         // Step 9. Be sure to close our resources!
+         if (initialContext != null)
+         {
+            initialContext.close();
+         }
+         if (connection != null)
+         {
+            connection.close();
+         }
+      }
+   }
+
+   // To do this we send a management message to get the message count.
+   // In real life you wouldn't create a new session every time you send a management message
+   private int getMessageCount(final Connection connection) throws Exception
+   {
+      QueueSession session = ((QueueConnection)connection).createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
+
+      Queue managementQueue = ActiveMQJMSClient.createQueue("activemq.management");
+
+      QueueRequestor requestor = new QueueRequestor(session, managementQueue);
+
+      connection.start();
+
+      Message m = session.createMessage();
+
+      JMSManagementHelper.putAttribute(m, "jms.queue.exampleQueue", "messageCount");
+
+      Message response = requestor.request(m);
+
+      int messageCount = (Integer)JMSManagementHelper.getResult(response);
+
+      return messageCount;
+   }
+
+}

examples/jms/proton-cpp/src/main/resources/jndi.properties

@@ -0,0 +1,20 @@
+# 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.
+
+java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+connectionFactory.ConnectionFactory=tcp://localhost:61616
+queue.queue/exampleQueue=exampleQueue

examples/jms/proton-ruby/src/main/scripts/receive.rb

@@ -20,6 +20,7 @@ require 'qpid_proton'
 
 messenger = Qpid::Proton::Messenger.new()
 messenger.incoming_window = 10
+messenger.timeout = 10000
 
 begin
   messenger.start
@@ -39,7 +40,7 @@ end
 msg = Qpid::Proton::Message.new
 
   begin
-    messenger.receive(10)
+    messenger.receive(1)
   rescue Qpid::Proton::ProtonError => error
     puts "ERROR: #{error.message}"
     exit
@@ -49,14 +50,14 @@ msg = Qpid::Proton::Message.new
     begin
       messenger.get(msg)
       # for 0.5:
-      messenger.accept()
+      # messenger.accept()
 
       # for 0.4:
       #messenger.accept(messenger.incoming_tracker, 0)#1 would mean cumulative
 
       # optional and the same in both versions (messenger will
       # settle itself when tracker passes out the window)
-      messenger.settle(messenger.incoming_tracker, 0)
+      # messenger.settle(messenger.incoming_tracker)
 
 
     rescue Qpid::Proton::Error => error
@@ -66,7 +67,7 @@ msg = Qpid::Proton::Message.new
 
     puts "Address: #{msg.address}"
     puts "Subject: #{msg.subject}"
-    puts "Content: #{msg.content}"
+    puts "Content: #{msg.body}"
     puts "Message ID: #{msg.id}"
   end
 

examples/jms/proton-ruby/src/main/scripts/send.rb

@@ -26,7 +26,7 @@ messenger.start
 msg = Qpid::Proton::Message.new
 msg.address = address
 msg.subject = "The time is #{Time.new}"
-msg.content = "Hello world!"
+msg.body = "Hello world!"
 msg.correlation_id = "554545"
 
 begin
@@ -44,6 +44,6 @@ rescue Qpid::Proton::ProtonError => error
     exit
 end
 
-puts "SENT: " + msg.content
+puts "SENT: " + msg.body
 
 messenger.stop