Repository: activemq-6 Updated Branches: refs/heads/master 0d599b856 -> c062d68a4
Fix proton-cpp pom missing version Fix proton-ruby script (update according to proton 0.8) Fix core example doc Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/5ea0a305 Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/5ea0a305 Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/5ea0a305 Branch: refs/heads/master Commit: 5ea0a3055dd38e781f172e5247ab3c136cae876d Parents: 0d599b8 Author: Howard Gao <[email protected]> Authored: Mon Mar 16 22:39:00 2015 +0800 Committer: Howard Gao <[email protected]> Committed: Mon Mar 16 22:40:47 2015 +0800 ---------------------------------------------------------------------- examples/core/embedded-remote/readme.html | 2 +- examples/core/embedded/readme.html | 2 +- examples/jms/proton-cpp/pom.xml | 1 + examples/jms/proton-ruby/src/main/scripts/receive.rb | 9 +++++---- examples/jms/proton-ruby/src/main/scripts/send.rb | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-6/blob/5ea0a305/examples/core/embedded-remote/readme.html ---------------------------------------------------------------------- diff --git a/examples/core/embedded-remote/readme.html b/examples/core/embedded-remote/readme.html index 9e8d338..a5cc882 100644 --- a/examples/core/embedded-remote/readme.html +++ b/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> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/5ea0a305/examples/core/embedded/readme.html ---------------------------------------------------------------------- diff --git a/examples/core/embedded/readme.html b/examples/core/embedded/readme.html index dcec9b6..441a68b 100644 --- a/examples/core/embedded/readme.html +++ b/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> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/5ea0a305/examples/jms/proton-cpp/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/proton-cpp/pom.xml b/examples/jms/proton-cpp/pom.xml index 6b3defe..a7888b4 100644 --- a/examples/jms/proton-cpp/pom.xml +++ b/examples/jms/proton-cpp/pom.xml @@ -50,6 +50,7 @@ under the License. <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jms_2.0_spec</artifactId> + <version>${geronimo.jms.2.spec.version}</version> </dependency> <dependency> <groupId>org.apache.activemq</groupId> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/5ea0a305/examples/jms/proton-ruby/src/main/scripts/receive.rb ---------------------------------------------------------------------- diff --git a/examples/jms/proton-ruby/src/main/scripts/receive.rb b/examples/jms/proton-ruby/src/main/scripts/receive.rb old mode 100644 new mode 100755 index 4019bd2..93228ff --- a/examples/jms/proton-ruby/src/main/scripts/receive.rb +++ b/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 http://git-wip-us.apache.org/repos/asf/activemq-6/blob/5ea0a305/examples/jms/proton-ruby/src/main/scripts/send.rb ---------------------------------------------------------------------- diff --git a/examples/jms/proton-ruby/src/main/scripts/send.rb b/examples/jms/proton-ruby/src/main/scripts/send.rb old mode 100644 new mode 100755 index ab4a2a4..1287280 --- a/examples/jms/proton-ruby/src/main/scripts/send.rb +++ b/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
