Merge pull request #511 from advantageous/develop

Develop
advantageous · Oct 29, 2015 · 0459f30 · 0459f30
2 parents 30dc28a + 19c6618
commit 0459f30
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/examples/standalone/src/main/java/io/advantageous/qbit/example/jsend/HelloWorldJSend.java b/examples/standalone/src/main/java/io/advantageous/qbit/example/jsend/HelloWorldJSend.java
@@ -75,7 +75,7 @@ public void helloJSend7(Callback<JSendResponse<List<String>>> callback) {
 
     public static void main(final String... args) {
         final ManagedServiceBuilder managedServiceBuilder =
-                ManagedServiceBuilder.managedServiceBuilder().setRootURI("/root");
+                ManagedServiceBuilder.managedServiceBuilder().setRootURI("/");
 
         /* Start the service. */
         managedServiceBuilder.addEndpointService(new HelloWorldJSend())

diff --git a/...andalone/src/main/java/io/advantageous/qbit/example/websocket/service/EchoClientMain.java b/...andalone/src/main/java/io/advantageous/qbit/example/websocket/service/EchoClientMain.java
@@ -10,7 +10,9 @@ public class EchoClientMain {
     public static void main(final String... args) throws Exception {
 
         final ClientBuilder clientBuilder = ClientBuilder.clientBuilder();
-        final Client client = clientBuilder.setHost("localhost").setPort(8080).setUri("/echo").build().startClient();
+        final Client client = clientBuilder.setHost("localhost")
+                .setPort(8080).setUri("/echo")
+                .build().startClient();
 
         final EchoAsync echoClient = client.createProxy(EchoAsync.class, "echo");
 

diff --git a/qbit/jms/src/main/java/io/advantageous/qbit/jms/JmsServiceBuilder.java b/qbit/jms/src/main/java/io/advantageous/qbit/jms/JmsServiceBuilder.java
@@ -71,7 +71,7 @@ public class JmsServiceBuilder {
 
     /** Pattern to create JNDI URL connect string from host and port. Default works with ActiveMQ.
      * Replaces #host# with host and #port# with port. */
-    private String providerURLPattern = "tcp://#host#:#port#";
+    private String providerURLPattern = "failover:tcp://#host#:#port#";
 
     /** Provider URL to JMS Broker which if not set will be constructed based on host, port and providerURLPattern. */
     private String providerURL =null;

diff --git a/qbit/redis/src/test/java/io/advantageous/qbit/kvstore/RedisKeyValueStoreTest.java b/qbit/redis/src/test/java/io/advantageous/qbit/kvstore/RedisKeyValueStoreTest.java
@@ -195,7 +195,9 @@ public void testPutWithConfirmationWrapped() throws Exception{
 
 
 
-        todoKVStore.putWithConfirmation(putCallbackBuilder.build(), "testPutWithConfirmationWrapped", new Todo(value));
+        todoKVStore.putWithConfirmation(putCallbackBuilder.build(),
+                "testPutWithConfirmationWrapped", new Todo(value));
+
         ServiceProxyUtils.flushServiceProxy(todoKVStore);
 
         putLatch.await(3, TimeUnit.SECONDS);