activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r869232 [38/44] - in /websites/production/activemq/content: ./ cache/ cms/ nms/ styles/highlighter/ styles/highlighter/scripts/ styles/highlighter/styles/ visualisation.thumbs/ web-console.thumbs/
Date Fri, 12 Jul 2013 12:46:31 GMT
Modified: websites/production/activemq/content/version-5-topologies.html
==============================================================================
--- websites/production/activemq/content/version-5-topologies.html (original)
+++ websites/production/activemq/content/version-5-topologies.html Fri Jul 12 12:46:14 2013
@@ -32,6 +32,7 @@
     </style>
     <![endif]-->
 
+    
     <title>
     Apache ActiveMQ &#8482; -- Version 5 Topologies
     </title>
@@ -50,8 +51,8 @@
       <div>
 
 <!-- Banner -->
-
-	<div id="asf_logo">
+<p>
+	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
             <a shape="rect" style="float:right; width:210px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:15px; margin-right:10px;" href="http://www.apache.org" title="The Apache Software Foundation">ASF</a>
@@ -82,13 +83,15 @@
 
 <p>A useful option when unit testing is to limit JMS communication to within a single JVM. For this use the protocol</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">vm:<span class="code-comment">//localhost</span>
-</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+vm://localhost
+]]></script>
 </div></div>
 <p>You can segment the VM protocol to different groups - e.g. if you want to have logically different JMS networks within the same JVM, you can group networks using different URIs. e.g.</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">vm:<span class="code-comment">//localhost/foo</span>
-</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+vm://localhost/foo
+]]></script>
 </div></div>
 <p>This will ensure that different segments do not interfere with one another. Though typically we use unique topic and queue destinations so that all traffic can coexist happily on the same logical network.</p>
 
@@ -100,13 +103,15 @@
 
 <p>e.g.</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">tcp:<span class="code-comment">//somehost:port</span>
-</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+tcp://somehost:port
+]]></script>
 </div></div>
 <p>Or for SSL</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">ssl:<span class="code-comment">//somehost:port</span>
-</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+ssl://somehost:port
+]]></script>
 </div></div>
 <p>You can use <a shape="rect" href="discovery.html" title="Discovery">Discovery</a> to find the brokers available that you can connect to which makes it easier to seamlessly connect to a cluster of brokers.</p>
 
@@ -141,8 +146,9 @@ There are various ways to implement a pe
 
 <p>We have a JXTA transport which will use the full JXTA stack for negotiating NAT and across firewalls and so forth for creating a true peer based JMS network.</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">jxta:<span class="code-comment">//hostname:port</span>
-</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+jxta://hostname:port
+]]></script>
 </div></div>
 <p>Currently you need to run one server which everyone connects to via JXTA. We've not yet created a pure peer network with JXTA</p>
           </div>
@@ -158,8 +164,8 @@ There are various ways to implement a pe
 
 <h3><a shape="rect" name="Navigation-Search"></a>Search</h3>
 
-
-<div>
+<p>
+</p><div>
 <form enctype="application/x-www-form-urlencoded" method="get" action="http://www.google.com/search" style="font-size: 10px;">
 <input type="hidden" name="ie" value="UTF-8">
 <input type="hidden" name="oe" value="UTF-8">

Modified: websites/production/activemq/content/version-5-web-samples.html
==============================================================================
--- websites/production/activemq/content/version-5-web-samples.html (original)
+++ websites/production/activemq/content/version-5-web-samples.html Fri Jul 12 12:46:14 2013
@@ -32,6 +32,7 @@
     </style>
     <![endif]-->
 
+    
     <title>
     Apache ActiveMQ &#8482; -- Version 5 Web Samples
     </title>
@@ -50,8 +51,8 @@
       <div>
 
 <!-- Banner -->
-
-	<div id="asf_logo">
+<p>
+	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
             <a shape="rect" style="float:right; width:210px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:15px; margin-right:10px;" href="http://www.apache.org" title="The Apache Software Foundation">ASF</a>
@@ -96,8 +97,8 @@
 
 <h3><a shape="rect" name="Navigation-Search"></a>Search</h3>
 
-
-<div>
+<p>
+</p><div>
 <form enctype="application/x-www-form-urlencoded" method="get" action="http://www.google.com/search" style="font-size: 10px;">
 <input type="hidden" name="ie" value="UTF-8">
 <input type="hidden" name="oe" value="UTF-8">

Modified: websites/production/activemq/content/version-5-xml-configuration.html
==============================================================================
--- websites/production/activemq/content/version-5-xml-configuration.html (original)
+++ websites/production/activemq/content/version-5-xml-configuration.html Fri Jul 12 12:46:14 2013
@@ -32,6 +32,16 @@
     </style>
     <![endif]-->
 
+          <link href='http://activemq.apache.org/styles/highlighter/styles/shCore.css' rel='stylesheet' type='text/css' /> 
+      <link href='http://activemq.apache.org/styles/highlighter/styles/shThemeEclipse.css' rel='stylesheet' type='text/css' /> 
+      <script src='http://activemq.apache.org/styles/highlighter/scripts/shCore.js' type='text/javascript'></script> 
+              <script src='http://activemq.apache.org/styles/highlighter/scripts/shBrushXml.js' type='text/javascript'></script> 
+         
+      <script type="text/javascript"> 
+        SyntaxHighlighter.defaults['toolbar'] = false; 
+        SyntaxHighlighter.all(); 
+      </script> 
+    
     <title>
     Apache ActiveMQ &#8482; -- Version 5 XML Configuration
     </title>
@@ -50,8 +60,8 @@
       <div>
 
 <!-- Banner -->
-
-	<div id="asf_logo">
+<p>
+	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
             <a shape="rect" style="float:right; width:210px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:15px; margin-right:10px;" href="http://www.apache.org" title="The Apache Software Foundation">ASF</a>
@@ -85,24 +95,25 @@
 <p>The default ActiveMQ configuration: <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/activemq/trunk/assembly/src/release/conf/activemq.xml">current default config</a>.</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml">&lt;beans
-  xmlns=<span class="code-quote">"http://www.springframework.org/schema/beans"</span>
-  <span class="code-keyword">xmlns:amq</span>=<span class="code-quote">"http://activemq.apache.org/schema/core"</span>
-  <span class="code-keyword">xmlns:xsi</span>=<span class="code-quote">"http://www.w3.org/2001/XMLSchema-instance"</span>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;beans
+  xmlns="http://www.springframework.org/schema/beans"
+  xmlns:amq="http://activemq.apache.org/schema/core"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
   http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd"&gt;
 
-    <span class="code-tag"><span class="code-comment">&lt;!-- Allows us to use system properties as variables in this configuration file --&gt;</span></span>
-    <span class="code-tag">&lt;bean class=<span class="code-quote">"org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"</span>&gt;</span>
-        <span class="code-tag">&lt;property name=<span class="code-quote">"locations"</span>&gt;</span>
-            <span class="code-tag">&lt;value&gt;</span>file:${activemq.conf}/credentials.properties<span class="code-tag">&lt;/value&gt;</span>
-        <span class="code-tag">&lt;/property&gt;</span>
-    <span class="code-tag">&lt;/bean&gt;</span>
+    &lt;!-- Allows us to use system properties as variables in this configuration file --&gt;
+    &lt;bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"&gt;
+        &lt;property name="locations"&gt;
+            &lt;value&gt;file:${activemq.conf}/credentials.properties&lt;/value&gt;
+        &lt;/property&gt;
+    &lt;/bean&gt;
 
     &lt;!--
-        The <span class="code-tag">&lt;broker&gt;</span> element is used to configure the ActiveMQ broker.
+        The &lt;broker&gt; element is used to configure the ActiveMQ broker.
     --&gt;
-    <span class="code-tag">&lt;broker xmlns=<span class="code-quote">"http://activemq.apache.org/schema/core"</span> brokerName=<span class="code-quote">"localhost"</span> dataDirectory=<span class="code-quote">"${activemq.data}"</span>&gt;</span>
+    &lt;broker xmlns="http://activemq.apache.org/schema/core" brokerName="localhost" dataDirectory="${activemq.data}"&gt;
 
         &lt;!--
             For better performances use VM cursor and small memory limit.
@@ -110,15 +121,15 @@
 
             http://activemq.apache.org/message-cursors.html
 
-            Also, if your producer is <span class="code-quote">"hanging"</span>, it's probably due to producer flow control.
+            Also, if your producer is "hanging", it's probably due to producer flow control.
             For more information, see:
             http://activemq.apache.org/producer-flow-control.html
         --&gt;
 
-        <span class="code-tag">&lt;destinationPolicy&gt;</span>
-            <span class="code-tag">&lt;policyMap&gt;</span>
-              <span class="code-tag">&lt;policyEntries&gt;</span>
-                <span class="code-tag">&lt;policyEntry topic=<span class="code-quote">"&gt;</span>"</span> producerFlowControl=<span class="code-quote">"true"</span>&gt;
+        &lt;destinationPolicy&gt;
+            &lt;policyMap&gt;
+              &lt;policyEntries&gt;
+                &lt;policyEntry topic="&gt;" producerFlowControl="true"&gt;
                     &lt;!-- The constantPendingMessageLimitStrategy is used to prevent
                          slow topic consumers to block producers and affect other consumers
                          by limiting the number of messages that are retained
@@ -127,24 +138,24 @@
                          http://activemq.apache.org/slow-consumer-handling.html
 
                     --&gt;
-                  <span class="code-tag">&lt;pendingMessageLimitStrategy&gt;</span>
-                    <span class="code-tag">&lt;constantPendingMessageLimitStrategy limit=<span class="code-quote">"1000"</span>/&gt;</span>
-                  <span class="code-tag">&lt;/pendingMessageLimitStrategy&gt;</span>
-                <span class="code-tag">&lt;/policyEntry&gt;</span>
-                <span class="code-tag">&lt;policyEntry queue=<span class="code-quote">"&gt;</span>"</span> producerFlowControl=<span class="code-quote">"true"</span> memoryLimit=<span class="code-quote">"1mb"</span>&gt;
+                  &lt;pendingMessageLimitStrategy&gt;
+                    &lt;constantPendingMessageLimitStrategy limit="1000"/&gt;
+                  &lt;/pendingMessageLimitStrategy&gt;
+                &lt;/policyEntry&gt;
+                &lt;policyEntry queue="&gt;" producerFlowControl="true" memoryLimit="1mb"&gt;
                   &lt;!-- Use VM cursor for better latency
                        For more information, see:
 
                        http://activemq.apache.org/message-cursors.html
 
-                  <span class="code-tag">&lt;pendingQueuePolicy&gt;</span>
-                    <span class="code-tag">&lt;vmQueueCursor/&gt;</span>
-                  <span class="code-tag">&lt;/pendingQueuePolicy&gt;</span>
+                  &lt;pendingQueuePolicy&gt;
+                    &lt;vmQueueCursor/&gt;
+                  &lt;/pendingQueuePolicy&gt;
                   --&gt;
-                <span class="code-tag">&lt;/policyEntry&gt;</span>
-              <span class="code-tag">&lt;/policyEntries&gt;</span>
-            <span class="code-tag">&lt;/policyMap&gt;</span>
-        <span class="code-tag">&lt;/destinationPolicy&gt;</span>
+                &lt;/policyEntry&gt;
+              &lt;/policyEntries&gt;
+            &lt;/policyMap&gt;
+        &lt;/destinationPolicy&gt;
 
 
         &lt;!--
@@ -154,9 +165,9 @@
 
             http://activemq.apache.org/jmx.html
         --&gt;
-        <span class="code-tag">&lt;managementContext&gt;</span>
-            <span class="code-tag">&lt;managementContext createConnector=<span class="code-quote">"false"</span>/&gt;</span>
-        <span class="code-tag">&lt;/managementContext&gt;</span>
+        &lt;managementContext&gt;
+            &lt;managementContext createConnector="false"/&gt;
+        &lt;/managementContext&gt;
 
         &lt;!--
             Configure message persistence for the broker. The default persistence
@@ -165,9 +176,9 @@
 
             http://activemq.apache.org/persistence.html
         --&gt;
-        <span class="code-tag">&lt;persistenceAdapter&gt;</span>
-            <span class="code-tag">&lt;kahaDB directory=<span class="code-quote">"${activemq.data}/kahadb"</span>/&gt;</span>
-        <span class="code-tag">&lt;/persistenceAdapter&gt;</span>
+        &lt;persistenceAdapter&gt;
+            &lt;kahaDB directory="${activemq.data}/kahadb"/&gt;
+        &lt;/persistenceAdapter&gt;
 
 
           &lt;!--
@@ -176,33 +187,33 @@
             http://activemq.apache.org/producer-flow-control.html
             If using ActiveMQ embedded - the following limits could safely be used:
 
-        <span class="code-tag">&lt;systemUsage&gt;</span>
-            <span class="code-tag">&lt;systemUsage&gt;</span>
-                <span class="code-tag">&lt;memoryUsage&gt;</span>
-                    <span class="code-tag">&lt;memoryUsage limit=<span class="code-quote">"20 mb"</span>/&gt;</span>
-                <span class="code-tag">&lt;/memoryUsage&gt;</span>
-                <span class="code-tag">&lt;storeUsage&gt;</span>
-                    <span class="code-tag">&lt;storeUsage limit=<span class="code-quote">"1 gb"</span>/&gt;</span>
-                <span class="code-tag">&lt;/storeUsage&gt;</span>
-                <span class="code-tag">&lt;tempUsage&gt;</span>
-                    <span class="code-tag">&lt;tempUsage limit=<span class="code-quote">"100 mb"</span>/&gt;</span>
-                <span class="code-tag">&lt;/tempUsage&gt;</span>
-            <span class="code-tag">&lt;/systemUsage&gt;</span>
-        <span class="code-tag">&lt;/systemUsage&gt;</span>
+        &lt;systemUsage&gt;
+            &lt;systemUsage&gt;
+                &lt;memoryUsage&gt;
+                    &lt;memoryUsage limit="20 mb"/&gt;
+                &lt;/memoryUsage&gt;
+                &lt;storeUsage&gt;
+                    &lt;storeUsage limit="1 gb"/&gt;
+                &lt;/storeUsage&gt;
+                &lt;tempUsage&gt;
+                    &lt;tempUsage limit="100 mb"/&gt;
+                &lt;/tempUsage&gt;
+            &lt;/systemUsage&gt;
+        &lt;/systemUsage&gt;
         --&gt;
-          <span class="code-tag">&lt;systemUsage&gt;</span>
-            <span class="code-tag">&lt;systemUsage&gt;</span>
-                <span class="code-tag">&lt;memoryUsage&gt;</span>
-                    <span class="code-tag">&lt;memoryUsage limit=<span class="code-quote">"64 mb"</span>/&gt;</span>
-                <span class="code-tag">&lt;/memoryUsage&gt;</span>
-                <span class="code-tag">&lt;storeUsage&gt;</span>
-                    <span class="code-tag">&lt;storeUsage limit=<span class="code-quote">"100 gb"</span>/&gt;</span>
-                <span class="code-tag">&lt;/storeUsage&gt;</span>
-                <span class="code-tag">&lt;tempUsage&gt;</span>
-                    <span class="code-tag">&lt;tempUsage limit=<span class="code-quote">"50 gb"</span>/&gt;</span>
-                <span class="code-tag">&lt;/tempUsage&gt;</span>
-            <span class="code-tag">&lt;/systemUsage&gt;</span>
-        <span class="code-tag">&lt;/systemUsage&gt;</span>
+          &lt;systemUsage&gt;
+            &lt;systemUsage&gt;
+                &lt;memoryUsage&gt;
+                    &lt;memoryUsage limit="64 mb"/&gt;
+                &lt;/memoryUsage&gt;
+                &lt;storeUsage&gt;
+                    &lt;storeUsage limit="100 gb"/&gt;
+                &lt;/storeUsage&gt;
+                &lt;tempUsage&gt;
+                    &lt;tempUsage limit="50 gb"/&gt;
+                &lt;/tempUsage&gt;
+            &lt;/systemUsage&gt;
+        &lt;/systemUsage&gt;
 
         &lt;!--
             The transport connectors expose ActiveMQ over a given protocol to
@@ -210,28 +221,28 @@
 
             http://activemq.apache.org/configuring-transports.html
         --&gt;
-        <span class="code-tag">&lt;transportConnectors&gt;</span>
-            <span class="code-tag"><span class="code-comment">&lt;!-- DOS protection, limit concurrent connections to 1000 and frame size to 100MB --&gt;</span></span>
-            <span class="code-tag">&lt;transportConnector name=<span class="code-quote">"openwire"</span> uri=<span class="code-quote">"tcp://0.0.0.0:61616?maximumConnections=1000&amp;amp;wireformat.maxFrameSize=104857600"</span>/&gt;</span>
-            <span class="code-tag">&lt;transportConnector name=<span class="code-quote">"amqp"</span> uri=<span class="code-quote">"amqp://0.0.0.0:5672?maximumConnections=1000&amp;amp;wireformat.maxFrameSize=104857600"</span>/&gt;</span>
-        <span class="code-tag">&lt;/transportConnectors&gt;</span>
-
-        <span class="code-tag"><span class="code-comment">&lt;!-- destroy the spring context on shutdown to stop jetty --&gt;</span></span>
-        <span class="code-tag">&lt;shutdownHooks&gt;</span>
-            <span class="code-tag">&lt;bean xmlns=<span class="code-quote">"http://www.springframework.org/schema/beans"</span> class=<span class="code-quote">"org.apache.activemq.hooks.SpringContextHook"</span> /&gt;</span>
-        <span class="code-tag">&lt;/shutdownHooks&gt;</span>
+        &lt;transportConnectors&gt;
+            &lt;!-- DOS protection, limit concurrent connections to 1000 and frame size to 100MB --&gt;
+            &lt;transportConnector name="openwire" uri="tcp://0.0.0.0:61616?maximumConnections=1000&amp;amp;wireFormat.maxFrameSize=104857600"/&gt;
+            &lt;transportConnector name="amqp" uri="amqp://0.0.0.0:5672?maximumConnections=1000&amp;amp;wireFormat.maxFrameSize=104857600"/&gt;
+        &lt;/transportConnectors&gt;
+
+        &lt;!-- destroy the spring context on shutdown to stop jetty --&gt;
+        &lt;shutdownHooks&gt;
+            &lt;bean xmlns="http://www.springframework.org/schema/beans" class="org.apache.activemq.hooks.SpringContextHook" /&gt;
+        &lt;/shutdownHooks&gt;
 
-    <span class="code-tag">&lt;/broker&gt;</span>
+    &lt;/broker&gt;
 
     &lt;!--
         Enable web consoles, REST and Ajax APIs and demos
 
         Take a look at ${ACTIVEMQ_HOME}/conf/jetty.xml for more details
     --&gt;
-    <span class="code-tag">&lt;import resource=<span class="code-quote">"jetty.xml"</span>/&gt;</span>
+    &lt;import resource="jetty.xml"/&gt;
 
-<span class="code-tag">&lt;/beans&gt;</span>
-</pre>
+&lt;/beans&gt;
+]]></script>
 </div></div>
 <p>From a binary distribution there is an <em>activemq</em> script allowing you to run a Message Broker as a stand alone process from the command line easily providing the $ACTIVEMQ_HOME/bin directory is on your PATH.</p>
 
@@ -269,8 +280,8 @@ Or of you want to explicitly configure t
 
 <h3><a shape="rect" name="Navigation-Search"></a>Search</h3>
 
-
-<div>
+<p>
+</p><div>
 <form enctype="application/x-www-form-urlencoded" method="get" action="http://www.google.com/search" style="font-size: 10px;">
 <input type="hidden" name="ie" value="UTF-8">
 <input type="hidden" name="oe" value="UTF-8">

Modified: websites/production/activemq/content/virtual-destinations.html
==============================================================================
--- websites/production/activemq/content/virtual-destinations.html (original)
+++ websites/production/activemq/content/virtual-destinations.html Fri Jul 12 12:46:14 2013
@@ -32,6 +32,17 @@
     </style>
     <![endif]-->
 
+          <link href='http://activemq.apache.org/styles/highlighter/styles/shCore.css' rel='stylesheet' type='text/css' /> 
+      <link href='http://activemq.apache.org/styles/highlighter/styles/shThemeEclipse.css' rel='stylesheet' type='text/css' /> 
+      <script src='http://activemq.apache.org/styles/highlighter/scripts/shCore.js' type='text/javascript'></script> 
+              <script src='http://activemq.apache.org/styles/highlighter/scripts/shBrushJava.js' type='text/javascript'></script> 
+              <script src='http://activemq.apache.org/styles/highlighter/scripts/shBrushXml.js' type='text/javascript'></script> 
+         
+      <script type="text/javascript"> 
+        SyntaxHighlighter.defaults['toolbar'] = false; 
+        SyntaxHighlighter.all(); 
+      </script> 
+    
     <title>
     Apache ActiveMQ &#8482; -- Virtual Destinations
     </title>
@@ -50,8 +61,8 @@
       <div>
 
 <!-- Banner -->
-
-	<div id="asf_logo">
+<p>
+	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
             <a shape="rect" style="float:right; width:210px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:15px; margin-right:10px;" href="http://www.apache.org" title="The Apache Software Foundation">ASF</a>
@@ -106,28 +117,29 @@
 <p>You can configure this to use whatever naming convention you wish. The following <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/incubator/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/broker/virtual/global-virtual-topics.xml">example</a> shows how to make all topics virtual topics. The example below is using the name <b>&gt;</b> to indicate 'match all topics'. You could use this wildcard to apply different virtual topic policies in different hierarchies.</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml">&lt;beans 
-  xmlns=<span class="code-quote">"http://www.springframework.org/schema/beans"</span> 
-  <span class="code-keyword">xmlns:amq</span>=<span class="code-quote">"http://activemq.apache.org/schema/core"</span>
-  <span class="code-keyword">xmlns:xsi</span>=<span class="code-quote">"http://www.w3.org/2001/XMLSchema-instance"</span>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  xmlns:amq="http://activemq.apache.org/schema/core"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
   http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd"&gt;
 
-  <span class="code-tag">&lt;bean class=<span class="code-quote">"org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"</span> /&gt;</span>
+  &lt;bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" /&gt;
 
-  <span class="code-tag">&lt;broker xmlns=<span class="code-quote">"http://activemq.apache.org/schema/core"</span>&gt;</span>
-    <span class="code-tag">&lt;destinationInterceptors&gt;</span>
-      <span class="code-tag">&lt;virtualDestinationInterceptor&gt;</span>
-        <span class="code-tag">&lt;virtualDestinations&gt;</span>
-          <span class="code-tag">&lt;virtualTopic name=<span class="code-quote">"&gt;</span>"</span> prefix=<span class="code-quote">"VirtualTopicConsumers.*."</span> selectorAware=<span class="code-quote">"false"</span>/&gt;
-        <span class="code-tag">&lt;/virtualDestinations&gt;</span>
-      <span class="code-tag">&lt;/virtualDestinationInterceptor&gt;</span>
-    <span class="code-tag">&lt;/destinationInterceptors&gt;</span>
+  &lt;broker xmlns="http://activemq.apache.org/schema/core"&gt;
+    &lt;destinationInterceptors&gt;
+      &lt;virtualDestinationInterceptor&gt;
+        &lt;virtualDestinations&gt;
+          &lt;virtualTopic name="&gt;" prefix="VirtualTopicConsumers.*." selectorAware="false"/&gt;
+        &lt;/virtualDestinations&gt;
+      &lt;/virtualDestinationInterceptor&gt;
+    &lt;/destinationInterceptors&gt;
 
-  <span class="code-tag">&lt;/broker&gt;</span>
+  &lt;/broker&gt;
 
-<span class="code-tag">&lt;/beans&gt;</span>
-</pre>
+&lt;/beans&gt;
+]]></script>
 </div></div>
 
 <p>Note that making a topic virtual does add a small CPU overhead when sending messages to the topic but it is fairly small. From version <b>5.4</b>, dispatch from virtual topics to subscription queues can be <b>selectorAware</b> such that only messages that match one of the existing subscribers are actually dispatched. Using this option prevents the build up of unmatched messages when selectors are used by exclusive consumers.</p>
@@ -139,33 +151,34 @@
 <p>The following <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/incubator/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/broker/virtual/composite-queue.xml">example</a> shows how to set up a <b>&lt;compositeQueue/&gt;</b> element in the XML configuration so that when a message is sent to <tt>MY.QUEUE</tt> then it is really forwarded to the physical queue <tt>FOO</tt> and the topic <tt>BAR</tt>.</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml">&lt;beans 
-  xmlns=<span class="code-quote">"http://www.springframework.org/schema/beans"</span> 
-  <span class="code-keyword">xmlns:amq</span>=<span class="code-quote">"http://activemq.apache.org/schema/core"</span>
-  <span class="code-keyword">xmlns:xsi</span>=<span class="code-quote">"http://www.w3.org/2001/XMLSchema-instance"</span>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  xmlns:amq="http://activemq.apache.org/schema/core"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
   http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd"&gt;
 
-  <span class="code-tag">&lt;bean class=<span class="code-quote">"org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"</span> /&gt;</span>
+  &lt;bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" /&gt;
 
-  <span class="code-tag">&lt;broker persistent=<span class="code-quote">"false"</span> useJmx=<span class="code-quote">"false"</span> xmlns=<span class="code-quote">"http://activemq.apache.org/schema/core"</span>&gt;</span>
-    <span class="code-tag">&lt;destinationInterceptors&gt;</span>
-      <span class="code-tag">&lt;virtualDestinationInterceptor&gt;</span>
-        <span class="code-tag">&lt;virtualDestinations&gt;</span>
-          <span class="code-tag">&lt;compositeQueue name=<span class="code-quote">"MY.QUEUE"</span>&gt;</span>
-            <span class="code-tag">&lt;forwardTo&gt;</span>
-              <span class="code-tag">&lt;queue physicalName=<span class="code-quote">"FOO"</span> /&gt;</span>
-              <span class="code-tag">&lt;topic physicalName=<span class="code-quote">"BAR"</span> /&gt;</span>
-            <span class="code-tag">&lt;/forwardTo&gt;</span>
-          <span class="code-tag">&lt;/compositeQueue&gt;</span>
-        <span class="code-tag">&lt;/virtualDestinations&gt;</span>
-      <span class="code-tag">&lt;/virtualDestinationInterceptor&gt;</span>
-    <span class="code-tag">&lt;/destinationInterceptors&gt;</span>
+  &lt;broker persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core"&gt;
+    &lt;destinationInterceptors&gt;
+      &lt;virtualDestinationInterceptor&gt;
+        &lt;virtualDestinations&gt;
+          &lt;compositeQueue name="MY.QUEUE"&gt;
+            &lt;forwardTo&gt;
+              &lt;queue physicalName="FOO" /&gt;
+              &lt;topic physicalName="BAR" /&gt;
+            &lt;/forwardTo&gt;
+          &lt;/compositeQueue&gt;
+        &lt;/virtualDestinations&gt;
+      &lt;/virtualDestinationInterceptor&gt;
+    &lt;/destinationInterceptors&gt;
 
-  <span class="code-tag">&lt;/broker&gt;</span>
+  &lt;/broker&gt;
 
-<span class="code-tag">&lt;/beans&gt;</span>
-</pre>
+&lt;/beans&gt;
+]]></script>
 </div></div>
 
 <p>By default, subscribers cannot consume messages directly from a composite queue or topic - it is a logical construct only. Given the configuration above, subscribers can only consume messages from <tt>FOO</tt> and <tt>BAR</tt>; but not <tt>MY.QUEUE</tt>.</p>
@@ -173,11 +186,11 @@
 <p>This behaviour can be altered to implement use cases such as watching a queue by sending the same messages to a notification topic (wire tapping), by setting the optionally set <tt>forwardOnly</tt> attribute to false.</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml"><span class="code-tag">&lt;compositeQueue name=<span class="code-quote">"IncomingOrders"</span> forwardOnly=<span class="code-quote">"false"</span>&gt;</span>
-    <span class="code-tag">&lt;forwardTo&gt;</span>
-        <span class="code-tag">&lt;topic physicalName=<span class="code-quote">"Notifications"</span> /&gt;</span>
-    <span class="code-tag">&lt;/forwardTo&gt;</span>
-<span class="code-tag">&lt;/compositeQueue&gt;</span></pre>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[&lt;compositeQueue name="IncomingOrders" forwardOnly="false"&gt;
+    &lt;forwardTo&gt;
+        &lt;topic physicalName="Notifications" /&gt;
+    &lt;/forwardTo&gt;
+&lt;/compositeQueue&gt;]]></script>
 </div></div>
 
 <p>Messages sent to <tt>IncomingOrders</tt> will all be copied and forwarded to <tt>Notifications</tt>, before being placed on the physical <tt>IncomingOrders</tt> queue for consumption by subscribers.</p>
@@ -193,33 +206,34 @@
 <p>The following example shows how a message sent to the virtual destination <b>MY.QUEUE</b> will be forwarded to <b>FOO</b> and <b>BAR</b> if the selectors match</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml">&lt;beans 
-  xmlns=<span class="code-quote">"http://www.springframework.org/schema/beans"</span> 
-  <span class="code-keyword">xmlns:amq</span>=<span class="code-quote">"http://activemq.apache.org/schema/core"</span>
-  <span class="code-keyword">xmlns:xsi</span>=<span class="code-quote">"http://www.w3.org/2001/XMLSchema-instance"</span>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  xmlns:amq="http://activemq.apache.org/schema/core"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
   http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd"&gt;
 
-  <span class="code-tag">&lt;bean class=<span class="code-quote">"org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"</span> /&gt;</span>
+  &lt;bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" /&gt;
 
-  <span class="code-tag">&lt;broker xmlns=<span class="code-quote">"http://activemq.apache.org/schema/core"</span>&gt;</span>
-    <span class="code-tag">&lt;destinationInterceptors&gt;</span>
-      <span class="code-tag">&lt;virtualDestinationInterceptor&gt;</span>
-        <span class="code-tag">&lt;virtualDestinations&gt;</span>
-          <span class="code-tag">&lt;compositeQueue name=<span class="code-quote">"MY.QUEUE"</span>&gt;</span>
-            <span class="code-tag">&lt;forwardTo&gt;</span>
-              <span class="code-tag">&lt;filteredDestination selector=<span class="code-quote">"odd = 'yes'"</span> queue=<span class="code-quote">"FOO"</span>/&gt;</span>
-              <span class="code-tag">&lt;filteredDestination selector=<span class="code-quote">"i = 5"</span> topic=<span class="code-quote">"BAR"</span>/&gt;</span>
-            <span class="code-tag">&lt;/forwardTo&gt;</span>
-          <span class="code-tag">&lt;/compositeQueue&gt;</span>
-        <span class="code-tag">&lt;/virtualDestinations&gt;</span>
-      <span class="code-tag">&lt;/virtualDestinationInterceptor&gt;</span>
-    <span class="code-tag">&lt;/destinationInterceptors&gt;</span>
+  &lt;broker xmlns="http://activemq.apache.org/schema/core"&gt;
+    &lt;destinationInterceptors&gt;
+      &lt;virtualDestinationInterceptor&gt;
+        &lt;virtualDestinations&gt;
+          &lt;compositeQueue name="MY.QUEUE"&gt;
+            &lt;forwardTo&gt;
+              &lt;filteredDestination selector="odd = 'yes'" queue="FOO"/&gt;
+              &lt;filteredDestination selector="i = 5" topic="BAR"/&gt;
+            &lt;/forwardTo&gt;
+          &lt;/compositeQueue&gt;
+        &lt;/virtualDestinations&gt;
+      &lt;/virtualDestinationInterceptor&gt;
+    &lt;/destinationInterceptors&gt;
 
-  <span class="code-tag">&lt;/broker&gt;</span>
+  &lt;/broker&gt;
 
-<span class="code-tag">&lt;/beans&gt;</span>
-</pre>
+&lt;/beans&gt;
+]]></script>
 </div></div>
 
 
@@ -230,15 +244,15 @@
 <p>Here is an example of how to do that:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml">
-    <span class="code-tag">&lt;networkConnectors&gt;</span>
-      <span class="code-tag">&lt;networkConnector uri=<span class="code-quote">"static://(tcp://localhost:61617)"</span>&gt;</span>
-      	<span class="code-tag">&lt;excludedDestinations&gt;</span>
-   	  <span class="code-tag">&lt;queue physicalName=<span class="code-quote">"Consumer.*.VirtualTopic.&gt;</span>"</span>/&gt;
-      	<span class="code-tag">&lt;/excludedDestinations&gt;</span>
-      <span class="code-tag">&lt;/networkConnector&gt;</span>
-    <span class="code-tag">&lt;/networkConnectors&gt;</span>
-</pre>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+    &lt;networkConnectors&gt;
+      &lt;networkConnector uri="static://(tcp://localhost:61617)"&gt;
+      	&lt;excludedDestinations&gt;
+   	  &lt;queue physicalName="Consumer.*.VirtualTopic.&gt;"/&gt;
+      	&lt;/excludedDestinations&gt;
+      &lt;/networkConnector&gt;
+    &lt;/networkConnectors&gt;
+]]></script>
 </div></div>
           </div>
         </td>
@@ -253,8 +267,8 @@
 
 <h3><a shape="rect" name="Navigation-Search"></a>Search</h3>
 
-
-<div>
+<p>
+</p><div>
 <form enctype="application/x-www-form-urlencoded" method="get" action="http://www.google.com/search" style="font-size: 10px;">
 <input type="hidden" name="ie" value="UTF-8">
 <input type="hidden" name="oe" value="UTF-8">

Modified: websites/production/activemq/content/visualisation-wish-list.html
==============================================================================
--- websites/production/activemq/content/visualisation-wish-list.html (original)
+++ websites/production/activemq/content/visualisation-wish-list.html Fri Jul 12 12:46:14 2013
@@ -32,6 +32,7 @@
     </style>
     <![endif]-->
 
+    
     <title>
     Apache ActiveMQ &#8482; -- Visualisation Wish List
     </title>
@@ -50,8 +51,8 @@
       <div>
 
 <!-- Banner -->
-
-	<div id="asf_logo">
+<p>
+	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
             <a shape="rect" style="float:right; width:210px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:15px; margin-right:10px;" href="http://www.apache.org" title="The Apache Software Foundation">ASF</a>
@@ -89,8 +90,8 @@
 
 <h3><a shape="rect" name="Navigation-Search"></a>Search</h3>
 
-
-<div>
+<p>
+</p><div>
 <form enctype="application/x-www-form-urlencoded" method="get" action="http://www.google.com/search" style="font-size: 10px;">
 <input type="hidden" name="ie" value="UTF-8">
 <input type="hidden" name="oe" value="UTF-8">

Modified: websites/production/activemq/content/visualisation.html
==============================================================================
--- websites/production/activemq/content/visualisation.html (original)
+++ websites/production/activemq/content/visualisation.html Fri Jul 12 12:46:14 2013
@@ -32,6 +32,7 @@
     </style>
     <![endif]-->
 
+    
     <title>
     Apache ActiveMQ &#8482; -- Visualisation
     </title>
@@ -50,8 +51,8 @@
       <div>
 
 <!-- Banner -->
-
-	<div id="asf_logo">
+<p>
+	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
             <a shape="rect" style="float:right; width:210px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:15px; margin-right:10px;" href="http://www.apache.org" title="The Apache Software Foundation">ASF</a>
@@ -113,8 +114,8 @@
 
 <h3><a shape="rect" name="Navigation-Search"></a>Search</h3>
 
-
-<div>
+<p>
+</p><div>
 <form enctype="application/x-www-form-urlencoded" method="get" action="http://www.google.com/search" style="font-size: 10px;">
 <input type="hidden" name="ie" value="UTF-8">
 <input type="hidden" name="oe" value="UTF-8">

Modified: websites/production/activemq/content/visualisation.thumbs/ActiveMQDestinations.png
==============================================================================
Files websites/production/activemq/content/visualisation.thumbs/ActiveMQDestinations.png (original) and websites/production/activemq/content/visualisation.thumbs/ActiveMQDestinations.png Fri Jul 12 12:46:14 2013 differ

Modified: websites/production/activemq/content/vm-protocol.html
==============================================================================
--- websites/production/activemq/content/vm-protocol.html (original)
+++ websites/production/activemq/content/vm-protocol.html Fri Jul 12 12:46:14 2013
@@ -32,6 +32,7 @@
     </style>
     <![endif]-->
 
+    
     <title>
     Apache ActiveMQ &#8482; -- VM Protocol
     </title>
@@ -50,8 +51,8 @@
       <div>
 
 <!-- Banner -->
-
-	<div id="asf_logo">
+<p>
+	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
             <a shape="rect" style="float:right; width:210px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:15px; margin-right:10px;" href="http://www.apache.org" title="The Apache Software Foundation">ASF</a>
@@ -98,8 +99,8 @@
 
 <h3><a shape="rect" name="Navigation-Search"></a>Search</h3>
 
-
-<div>
+<p>
+</p><div>
 <form enctype="application/x-www-form-urlencoded" method="get" action="http://www.google.com/search" style="font-size: 10px;">
 <input type="hidden" name="ie" value="UTF-8">
 <input type="hidden" name="oe" value="UTF-8">

Modified: websites/production/activemq/content/vm-transport-reference.html
==============================================================================
--- websites/production/activemq/content/vm-transport-reference.html (original)
+++ websites/production/activemq/content/vm-transport-reference.html Fri Jul 12 12:46:14 2013
@@ -32,6 +32,16 @@
     </style>
     <![endif]-->
 
+          <link href='http://activemq.apache.org/styles/highlighter/styles/shCore.css' rel='stylesheet' type='text/css' /> 
+      <link href='http://activemq.apache.org/styles/highlighter/styles/shThemeEclipse.css' rel='stylesheet' type='text/css' /> 
+      <script src='http://activemq.apache.org/styles/highlighter/scripts/shCore.js' type='text/javascript'></script> 
+              <script src='http://activemq.apache.org/styles/highlighter/scripts/shBrushJava.js' type='text/javascript'></script> 
+         
+      <script type="text/javascript"> 
+        SyntaxHighlighter.defaults['toolbar'] = false; 
+        SyntaxHighlighter.all(); 
+      </script> 
+    
     <title>
     Apache ActiveMQ &#8482; -- VM Transport Reference
     </title>
@@ -50,8 +60,8 @@
       <div>
 
 <!-- Banner -->
-
-	<div id="asf_logo">
+<p>
+	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
             <a shape="rect" style="float:right; width:210px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:15px; margin-right:10px;" href="http://www.apache.org" title="The Apache Software Foundation">ASF</a>
@@ -102,16 +112,16 @@
 
 <p>So to work around this if you are using Spring you may wish to use the <b>depends-on</b> attribute so that your JMS ConnectionFactory depends on the embedded broker to avoid this happening. e.g.</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-&lt;bean id=<span class="code-quote">"broker"</span> class=<span class="code-quote">"org.apache.activemq.xbean.BrokerFactoryBean"</span>&gt;
-    &lt;property name=<span class="code-quote">"config"</span> value=<span class="code-quote">"classpath:org/apache/activemq/xbean/activemq.xml"</span> /&gt;
-    &lt;property name=<span class="code-quote">"start"</span> value=<span class="code-quote">"<span class="code-keyword">true</span>"</span> /&gt;
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;bean id="broker" class="org.apache.activemq.xbean.BrokerFactoryBean"&gt;
+    &lt;property name="config" value="classpath:org/apache/activemq/xbean/activemq.xml" /&gt;
+    &lt;property name="start" value="true" /&gt;
   &lt;/bean&gt;
 
-  &lt;bean id=<span class="code-quote">"connectionFactory"</span> class=<span class="code-quote">"org.apache.activemq.ActiveMQConnectionFactory"</span> depends-on=<span class="code-quote">"broker"</span>&gt;
-    &lt;property name=<span class="code-quote">"brokerURL"</span> value=<span class="code-quote">"vm:<span class="code-comment">//localhost"</span>/&gt;
-</span>  &lt;/bean&gt;
-</pre>
+  &lt;bean id="connectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory" depends-on="broker"&gt;
+    &lt;property name="brokerURL" value="vm://localhost"/&gt;
+  &lt;/bean&gt;
+]]></script>
 </div></div></td></tr></table></div>
 
 <h4><a shape="rect" name="VMTransportReference-AdvancedBrokerConfigurationSyntax"></a>Advanced Broker Configuration Syntax</h4>
@@ -141,9 +151,9 @@ or<br clear="none">
 
 <p>&#160;To start an embedded broker using the vm transport and configure it using an external configuration file (i.e. activemq.xml), use the following URI:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
- vm:<span class="code-comment">//localhost?brokerConfig=xbean:activemq.xml </span>
-</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+ vm://localhost?brokerConfig=xbean:activemq.xml 
+]]></script>
 </div></div>
           </div>
         </td>
@@ -158,8 +168,8 @@ or<br clear="none">
 
 <h3><a shape="rect" name="Navigation-Search"></a>Search</h3>
 
-
-<div>
+<p>
+</p><div>
 <form enctype="application/x-www-form-urlencoded" method="get" action="http://www.google.com/search" style="font-size: 10px;">
 <input type="hidden" name="ie" value="UTF-8">
 <input type="hidden" name="oe" value="UTF-8">

Modified: websites/production/activemq/content/web-console.html
==============================================================================
--- websites/production/activemq/content/web-console.html (original)
+++ websites/production/activemq/content/web-console.html Fri Jul 12 12:46:14 2013
@@ -32,6 +32,17 @@
     </style>
     <![endif]-->
 
+          <link href='http://activemq.apache.org/styles/highlighter/styles/shCore.css' rel='stylesheet' type='text/css' /> 
+      <link href='http://activemq.apache.org/styles/highlighter/styles/shThemeEclipse.css' rel='stylesheet' type='text/css' /> 
+      <script src='http://activemq.apache.org/styles/highlighter/scripts/shCore.js' type='text/javascript'></script> 
+              <script src='http://activemq.apache.org/styles/highlighter/scripts/shBrushJava.js' type='text/javascript'></script> 
+              <script src='http://activemq.apache.org/styles/highlighter/scripts/shBrushXml.js' type='text/javascript'></script> 
+         
+      <script type="text/javascript"> 
+        SyntaxHighlighter.defaults['toolbar'] = false; 
+        SyntaxHighlighter.all(); 
+      </script> 
+    
     <title>
     Apache ActiveMQ &#8482; -- Web Console
     </title>
@@ -50,8 +61,8 @@
       <div>
 
 <!-- Banner -->
-
-	<div id="asf_logo">
+<p>
+	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
             <a shape="rect" style="float:right; width:210px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:15px; margin-right:10px;" href="http://www.apache.org" title="The Apache Software Foundation">ASF</a>
@@ -77,19 +88,19 @@
 <div class="panelMacro"><table class="infoMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><b>Web console 5.3.1 problem workaround</b><br clear="none">If your web console doesn't start correctly in 5.3.1 release, you're probably ran into a problem with a workaround for Camel web application. To fix it, just change <tt>ActiveMQCompnent</tt> setup in <tt>webapps/camel/WEB-INF/applicationContext.xml</tt> (and <tt>conf/camel.xml</tt> if you use it), to something like this:
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
     &lt;!-- configure the camel activemq component to use the current broker --&gt;
-    &lt;bean id=<span class="code-quote">"activemq"</span> class=<span class="code-quote">"org.apache.activemq.camel.component.ActiveMQComponent"</span> &gt;
-        &lt;property name=<span class="code-quote">"connectionFactory"</span>&gt;
-          &lt;bean class=<span class="code-quote">"org.apache.activemq.ActiveMQConnectionFactory"</span>&gt;
-            &lt;property name=<span class="code-quote">"brokerURL"</span> value=<span class="code-quote">"vm:<span class="code-comment">//localhost?create=<span class="code-keyword">false</span>&amp;amp;waitForStart=10000"</span> /&gt;
-</span>            &lt;property name=<span class="code-quote">"userName"</span> value=<span class="code-quote">"${activemq.username}"</span>/&gt;
-            &lt;property name=<span class="code-quote">"password"</span> value=<span class="code-quote">"${activemq.password}"</span>/&gt;
+    &lt;bean id="activemq" class="org.apache.activemq.camel.component.ActiveMQComponent" &gt;
+        &lt;property name="connectionFactory"&gt;
+          &lt;bean class="org.apache.activemq.ActiveMQConnectionFactory"&gt;
+            &lt;property name="brokerURL" value="vm://localhost?create=false&amp;amp;waitForStart=10000" /&gt;
+            &lt;property name="userName" value="${activemq.username}"/&gt;
+            &lt;property name="password" value="${activemq.password}"/&gt;
 
           &lt;/bean&gt;
         &lt;/property&gt;
     &lt;/bean&gt;
-</pre>
+]]></script>
 </div></div>
 
 <p>This will be fixed in 5.4.0 release</p></td></tr></table></div>
@@ -105,22 +116,22 @@
 <p>In the event that you are running a standalone broker and the Web Console is not reachable, check that the following lines are included in your ActiveMQ config xml:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">&lt;bean class=<span class="code-quote">"org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"</span>&gt;
-&lt;property name=<span class="code-quote">"locations"</span>&gt;
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[&lt;bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"&gt;
+&lt;property name="locations"&gt;
 &lt;value&gt;file:${activemq.base}/conf/credentials.properties&lt;/value&gt;
 &lt;/property&gt;
 &lt;/bean&gt;
 
 &lt;!-- your broker config goes here --&gt;
 
-&lt;<span class="code-keyword">import</span> resource=<span class="code-quote">"${activemq.base}/conf/jetty.xml"</span> /&gt;</pre>
+&lt;import resource="${activemq.base}/conf/jetty.xml" /&gt;]]></script>
 </div></div>
 
 <p>The import will start up an embedded Jetty container. To verify that the config is working, the following should appear in your ActiveMQ console/logs on next startup:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">INFO | jetty-7.1.6.v20100715
-INFO | ActiveMQ WebConsole initialized.</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[INFO | jetty-7.1.6.v20100715
+INFO | ActiveMQ WebConsole initialized.]]></script>
 </div></div>
 
 
@@ -133,17 +144,17 @@ INFO | ActiveMQ WebConsole initialized.<
 
 <p>If you want to change the port number of the web application try the following</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 mvn jetty:run -Djetty.port=9090
-</pre>
+]]></script>
 </div></div>
 <p>You can also set the port with the port attribute in the nioConnector tag in the activemq.xml configuration file:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml">
-<span class="code-tag">&lt;connectors&gt;</span>
-    <span class="code-tag">&lt;nioConnector port=<span class="code-quote">"8161"</span> /&gt;</span>
-<span class="code-tag">&lt;/connectors&gt;</span>
-</pre>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;connectors&gt;
+    &lt;nioConnector port="8161" /&gt;
+&lt;/connectors&gt;
+]]></script>
 </div></div>
 
 <h3><a shape="rect" name="WebConsole-SecuringWebConsole"></a>Securing Web Console</h3>
@@ -151,13 +162,13 @@ mvn jetty:run -Djetty.port=9090
 <p>Starting with ActiveMQ 5.4.0, Web Console comes pre-configured with basic access authentication setup. It's turned off by default, so you need to turn it on explicitly, but it's really simple. Go to the <tt>${ACTIVEMQ_HOME}/conf/jetty.xml</tt> and find the following line</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">&lt;property name=<span class="code-quote">"authenticate"</span> value=<span class="code-quote">"<span class="code-keyword">false</span>"</span> /&gt;</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[&lt;property name="authenticate" value="false" /&gt;]]></script>
 </div></div>
 
 <p>and change it to</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">&lt;property name=<span class="code-quote">"authenticate"</span> value=<span class="code-quote">"<span class="code-keyword">true</span>"</span> /&gt;</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[&lt;property name="authenticate" value="true" /&gt;]]></script>
 </div></div>
 
 <p>That's it. From that point on, web server will look at <tt>${ACTIVEMQ_HOME}/conf/jetty-realm.properties</tt> file trying to match provided credentials with those listed in the file. By default, you can access the web console with <tt>admin/admin</tt> credentials. That can be changed (and more users can be added) in the <tt>jetty-realm.properties</tt> file.</p>
@@ -165,19 +176,19 @@ mvn jetty:run -Djetty.port=9090
 <p>You may also wish to enable <b>ssl connector</b> to further secure access to the web console and other web resources of the broker. To do that, go to the <tt>${ACTIVEMQ_HOME}/conf/jetty.xml</tt> and make sure you have the secure connector enabled. In versions 5.7 and newer just uncomment a predefined config. In any case make sure your connectors settings looks similar to this.</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">        &lt;property name=<span class="code-quote">"connectors"</span>&gt;
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[        &lt;property name="connectors"&gt;
             &lt;list&gt;
-                &lt;bean id=<span class="code-quote">"Connector"</span> class=<span class="code-quote">"org.eclipse.jetty.server.nio.SelectChannelConnector"</span>&gt;
-                    &lt;property name=<span class="code-quote">"port"</span> value=<span class="code-quote">"8161"</span> /&gt;
+                &lt;bean id="Connector" class="org.eclipse.jetty.server.nio.SelectChannelConnector"&gt;
+                    &lt;property name="port" value="8161" /&gt;
                 &lt;/bean&gt;
-                &lt;bean id=<span class="code-quote">"SecureConnector"</span> class=<span class="code-quote">"org.eclipse.jetty.server.ssl.SslSelectChannelConnector"</span>&gt;
-                    &lt;property name=<span class="code-quote">"port"</span> value=<span class="code-quote">"8162"</span> /&gt;
-                    &lt;property name=<span class="code-quote">"keystore"</span> value=<span class="code-quote">"file:${activemq.conf}/broker.ks"</span> /&gt;
-                    &lt;property name=<span class="code-quote">"password"</span> value=<span class="code-quote">"password"</span> /&gt;
+                &lt;bean id="SecureConnector" class="org.eclipse.jetty.server.ssl.SslSelectChannelConnector"&gt;
+                    &lt;property name="port" value="8162" /&gt;
+                    &lt;property name="keystore" value="file:${activemq.conf}/broker.ks" /&gt;
+                    &lt;property name="password" value="password" /&gt;
                 &lt;/bean&gt;
             &lt;/list&gt;
         &lt;/property&gt;
-</pre>
+]]></script>
 </div></div>
 
 <p>Standard connector is left enabled in this example, but you can remove it in your configuration if you wish.</p>
@@ -220,37 +231,37 @@ Example:<br clear="none">
 
 <p>To start the web-console in a dedicated jetty use the following startup-script (execute from the jetty-root-dir):</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-java -Dwebconsole.type=properties -Dwebconsole.jms.url=tcp:<span class="code-comment">//localhost:61616 -Dwebconsole.jmx.url=service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi -Dwebconsole.jmx.user=system -Dwebconsole.jmx.password=manager -jar start.jar</span>
-</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+java -Dwebconsole.type=properties -Dwebconsole.jms.url=tcp://localhost:61616 -Dwebconsole.jmx.url=service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi -Dwebconsole.jmx.user=system -Dwebconsole.jmx.password=manager -jar start.jar
+]]></script>
 </div></div>
 <p>If the web-console should be password protected (BASIC Authentication) use the standard jetty mechanisms:<br clear="none">
 1. Define a UserRealm in jetty.xml:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-&lt;Set name=<span class="code-quote">"UserRealms"</span>&gt;
-      &lt;Array type=<span class="code-quote">"org.mortbay.jetty.security.UserRealm"</span>&gt;
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;Set name="UserRealms"&gt;
+      &lt;Array type="org.mortbay.jetty.security.UserRealm"&gt;
         &lt;Item&gt;
-          &lt;New class=<span class="code-quote">"org.mortbay.jetty.security.HashUserRealm"</span>&gt;
-            &lt;Set name=<span class="code-quote">"name"</span>&gt;ActiveMQ Realm&lt;/Set&gt;
-            &lt;Set name=<span class="code-quote">"config"</span>&gt;&lt;SystemProperty name=<span class="code-quote">"jetty.home"</span> <span class="code-keyword">default</span>=<span class="code-quote">"."</span>/&gt;/etc/amqrealm.properties&lt;/Set&gt;
+          &lt;New class="org.mortbay.jetty.security.HashUserRealm"&gt;
+            &lt;Set name="name"&gt;ActiveMQ Realm&lt;/Set&gt;
+            &lt;Set name="config"&gt;&lt;SystemProperty name="jetty.home" default="."/&gt;/etc/amqrealm.properties&lt;/Set&gt;
           &lt;/New&gt;
         &lt;/Item&gt;
       &lt;/Array&gt;
     &lt;/Set&gt;
-</pre>
+]]></script>
 </div></div>
 
 <p>2. Configure the users/passwords in the amqrealm.properties in jetty/etc</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 myAdmin: secret,amqAdmin
-</pre>
+]]></script>
 </div></div>
 
 <p>3. Configure the security constraint either in the webconsoles web.xml or in jetty's webdefault.xml</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 &lt;security-constraint&gt;
     &lt;web-resource-collection&gt;
       &lt;web-resource-name&gt;A Protected Page&lt;/web-resource-name&gt;
@@ -265,7 +276,7 @@ myAdmin: secret,amqAdmin
     &lt;auth-method&gt;BASIC&lt;/auth-method&gt;
     &lt;realm-name&gt;ActiveMQ Realm&lt;/realm-name&gt;
   &lt;/login-config&gt;
-</pre>
+]]></script>
 </div></div>
 
 <p>This is just a sample configuration of a password protected webconsole. Instead of the HashUserRealm one could also use a KerberosRealm or a JDBCRealm.</p>
@@ -278,13 +289,13 @@ myAdmin: secret,amqAdmin
 
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 JAVA_OPTS="-Dwebconsole.type=properties \
--Dwebconsole.jms.url=tcp:<span class="code-comment">//localhost:61616 \
-</span>-Dwebconsole.jmx.url=service:jmx:rmi:<span class="code-comment">///jndi/rmi://localhost:1099/jmxrmi \
-</span>-Dwebconsole.jmx.user= \
+-Dwebconsole.jms.url=tcp://localhost:61616 \
+-Dwebconsole.jmx.url=service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi \
+-Dwebconsole.jmx.user= \
 -Dwebconsole.jmx.password="
-</pre>
+]]></script>
 </div></div>
 
 <ul><li>Start your Tomcat and visit the appropriate URL (e.g. <a shape="rect" class="external-link" href="http://localhost:8080/activemq-web-console-5.0.0/" rel="nofollow">http://localhost:8080/activemq-web-console-5.0.0/</a>)</li></ul>
@@ -316,21 +327,21 @@ JAVA_OPTS="-Dwebconsole.type=properties 
 
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-#mvn clean install -Dmaven.test.skip=<span class="code-keyword">true</span>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+#mvn clean install -Dmaven.test.skip=true
 cd activemq-web-console
 patch -p0&lt;AMQ-2145.diff
-mvn jetty:run -Dwebconsole.type=properties -Dwebconsole.jms.url=tcp:<span class="code-comment">//localhost:61616 \
-</span>-Dwebconsole.jmx.url=service:jmx:rmi:<span class="code-comment">///jndi/rmi://localhost:1099/jmxrmi -Dwebconsole.jmx.user=system \
-</span>-Dwebconsole.jmx.password=manager
-</pre>
+mvn jetty:run -Dwebconsole.type=properties -Dwebconsole.jms.url=tcp://localhost:61616 \
+-Dwebconsole.jmx.url=service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi -Dwebconsole.jmx.user=system \
+-Dwebconsole.jmx.password=manager
+]]></script>
 </div></div>
 
 <p>Most likely everyone except geronimo 2.1.x users will have upgraded to activemq 5.x.  Note that the jms connector url for geronimo is </p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
--Dwebconsole.jmx.url=service:jmx:rmi:<span class="code-comment">///jndi/rmi://localhost:1099/JMXConnector</span>
-</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+-Dwebconsole.jmx.url=service:jmx:rmi:///jndi/rmi://localhost:1099/JMXConnector
+]]></script>
 </div></div>
 
 <p>Now point your browser at <a shape="rect" class="external-link" href="http://localhost:8080/" rel="nofollow">http://localhost:8080/</a> (or the appropriate port)</p>
@@ -349,8 +360,8 @@ mvn jetty:run -Dwebconsole.type=properti
 
 <h3><a shape="rect" name="Navigation-Search"></a>Search</h3>
 
-
-<div>
+<p>
+</p><div>
 <form enctype="application/x-www-form-urlencoded" method="get" action="http://www.google.com/search" style="font-size: 10px;">
 <input type="hidden" name="ie" value="UTF-8">
 <input type="hidden" name="oe" value="UTF-8">

Modified: websites/production/activemq/content/web-console.thumbs/web_console.png
==============================================================================
Files websites/production/activemq/content/web-console.thumbs/web_console.png (original) and websites/production/activemq/content/web-console.thumbs/web_console.png Fri Jul 12 12:46:14 2013 differ

Modified: websites/production/activemq/content/web-samples.html
==============================================================================
--- websites/production/activemq/content/web-samples.html (original)
+++ websites/production/activemq/content/web-samples.html Fri Jul 12 12:46:14 2013
@@ -32,6 +32,16 @@
     </style>
     <![endif]-->
 
+          <link href='http://activemq.apache.org/styles/highlighter/styles/shCore.css' rel='stylesheet' type='text/css' /> 
+      <link href='http://activemq.apache.org/styles/highlighter/styles/shThemeEclipse.css' rel='stylesheet' type='text/css' /> 
+      <script src='http://activemq.apache.org/styles/highlighter/scripts/shCore.js' type='text/javascript'></script> 
+              <script src='http://activemq.apache.org/styles/highlighter/scripts/shBrushJava.js' type='text/javascript'></script> 
+         
+      <script type="text/javascript"> 
+        SyntaxHighlighter.defaults['toolbar'] = false; 
+        SyntaxHighlighter.all(); 
+      </script> 
+    
     <title>
     Apache ActiveMQ &#8482; -- Web Samples
     </title>
@@ -50,8 +60,8 @@
       <div>
 
 <!-- Banner -->
-
-	<div id="asf_logo">
+<p>
+	</p><div id="asf_logo">
 	<div id="activemq_logo">
             <a shape="rect" style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://activemq.apache.org" title="The most popular and powerful open source Message Broker">ActiveMQ</a> &#8482;
             <a shape="rect" style="float:right; width:210px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:15px; margin-right:10px;" href="http://www.apache.org" title="The Apache Software Foundation">ASF</a>
@@ -79,7 +89,7 @@
 <p>From 5.8 onwards, demos are excluded from default configuration. To start a broker with web examples, use <tt>activemq-demo.xml</tt> configuration file, like</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">bin/activemq console xbean:conf/activemq-demo.xml</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[bin/activemq console xbean:conf/activemq-demo.xml]]></script>
 </div></div>
 
 <h2><a shape="rect" name="WebSamples-SeeAlso"></a>See Also</h2>
@@ -99,8 +109,8 @@
 
 <h3><a shape="rect" name="Navigation-Search"></a>Search</h3>
 
-
-<div>
+<p>
+</p><div>
 <form enctype="application/x-www-form-urlencoded" method="get" action="http://www.google.com/search" style="font-size: 10px;">
 <input type="hidden" name="ie" value="UTF-8">
 <input type="hidden" name="oe" value="UTF-8">



Mime
View raw message