[2/2] git commit: Enabled the websocket transport by default and fix up the mqtt websocket demo so you get a random client id by default.

[chirino]

Enabled the websocket transport by default and fix up the mqtt websocket demo 
so you get a random client id by default.


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/51cf06be
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/51cf06be
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/51cf06be

Branch: refs/heads/trunk
Commit: 51cf06be5472eeceea0c360048d809fb43aee535
Parents: 6773b8f
Author: Hiram Chirino <hi...@hiramchirino.com>
Authored: Thu Oct 10 11:38:02 2013 -0400
Committer: Hiram Chirino <hi...@hiramchirino.com>
Committed: Thu Oct 10 11:38:08 2013 -0400

----------------------------------------------------------------------
 assembly/src/release/conf/activemq.xml                   | 1 +
 assembly/src/release/examples/mqtt/websocket/index.html  | 4 +++-
 assembly/src/release/examples/stomp/websocket/index.html | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/51cf06be/assembly/src/release/conf/activemq.xml
----------------------------------------------------------------------
diff --git a/assembly/src/release/conf/activemq.xml 
b/assembly/src/release/conf/activemq.xml
index d5477c7..e09f474 100755
--- a/assembly/src/release/conf/activemq.xml
+++ b/assembly/src/release/conf/activemq.xml
@@ -114,6 +114,7 @@
             <transportConnector name="amqp" 
uri="amqp://0.0.0.0:5672?maximumConnections=1000&amp;wireFormat.maxFrameSize=104857600"/>
             <transportConnector name="stomp" 
uri="stomp://0.0.0.0:61613?maximumConnections=1000&amp;wireFormat.maxFrameSize=104857600"/>
             <transportConnector name="mqtt" 
uri="mqtt://0.0.0.0:1883?maximumConnections=1000&amp;wireFormat.maxFrameSize=104857600"/>
+            <transportConnector name="ws" 
uri="ws://0.0.0.0:61614?maximumConnections=1000&amp;wireFormat.maxFrameSize=104857600"/>
         </transportConnectors>
 
         <!-- destroy the spring context on shutdown to stop jetty -->

http://git-wip-us.apache.org/repos/asf/activemq/blob/51cf06be/assembly/src/release/examples/mqtt/websocket/index.html
----------------------------------------------------------------------
diff --git a/assembly/src/release/examples/mqtt/websocket/index.html 
b/assembly/src/release/examples/mqtt/websocket/index.html
index 9b45268..31201a2 100644
--- a/assembly/src/release/examples/mqtt/websocket/index.html
+++ b/assembly/src/release/examples/mqtt/websocket/index.html
@@ -41,7 +41,7 @@
                 <div class="control-group">
                   <label>Port</label>
                   <div class="controls">
-                    <input name=url id='connect_port' value='61623' 
type="text">
+                    <input name=url id='connect_port' value='61614' 
type="text">
                   </div>
                 </div>
                 <div class="control-group">
@@ -101,6 +101,8 @@
     <script src="js/mqttws31.js"></script>
     <script>//<![CDATA[
 $(document).ready(function(){
+  
+  $("#connect_clientId").val("example-"+(Math.floor(Math.random() * 100000)));
   if( !window.WebSocket) {
     $("#connect").html("\
         <h1>Get a new Web Browser!</h1>\

http://git-wip-us.apache.org/repos/asf/activemq/blob/51cf06be/assembly/src/release/examples/stomp/websocket/index.html
----------------------------------------------------------------------
diff --git a/assembly/src/release/examples/stomp/websocket/index.html 
b/assembly/src/release/examples/stomp/websocket/index.html
index 03a27cc..12b5b23 100644
--- a/assembly/src/release/examples/stomp/websocket/index.html
+++ b/assembly/src/release/examples/stomp/websocket/index.html
@@ -35,7 +35,7 @@
                 <div class="control-group">
                   <label>WebSocket URL</label>
                   <div class="controls">
-                    <input name=url id='connect_url' 
value='ws://localhost:61623' type="text">
+                    <input name=url id='connect_url' 
value='ws://localhost:61614' type="text">
                   </div>
                 </div>
                 <div class="control-group">