You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2013/07/12 14:46:31 UTC

svn commit: r869232 [39/44] - in /websites/production/activemq/content: ./ cache/ cms/ nms/ styles/highlighter/ styles/highlighter/scripts/ styles/highlighter/styles/ visualisation.thumbs/ web-console.thumbs/

Modified: websites/production/activemq/content/weblogic-integration.html
==============================================================================
--- websites/production/activemq/content/weblogic-integration.html (original)
+++ websites/production/activemq/content/weblogic-integration.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; -- WebLogic Integration
     </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>
@@ -198,28 +209,30 @@ An ActiveMQ broker may be run within Web
 
 <p><b>J2EE WEB-INF/web.xml</b></p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml"><span class="code-tag">&lt;?xml version=<span class="code-quote">"1.0"</span> encoding=<span class="code-quote">"UTF-8"</span>?&gt;</span>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;?xml version="1.0" encoding="UTF-8"?&gt;
 
-&lt;web-app version=<span class="code-quote">"2.4"</span>
-         xmlns=<span class="code-quote">"http://java.sun.com/xml/ns/j2ee"</span>
-         <span class="code-keyword">xmlns:xsi</span>=<span class="code-quote">"http://www.w3.org/2001/XMLSchema-instance"</span>
-         xsi:schemaLocation=<span class="code-quote">"http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"</span> &gt;
-    <span class="code-tag">&lt;listener&gt;</span>
-        <span class="code-tag">&lt;listener-class&gt;</span>org.springframework.web.context.ContextLoaderListener<span class="code-tag">&lt;/listener-class&gt;</span>
-    <span class="code-tag">&lt;/listener&gt;</span>
-<span class="code-tag">&lt;/web-app&gt;</span>
-</pre>
+&lt;web-app version="2.4"
+         xmlns="http://java.sun.com/xml/ns/j2ee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" &gt;
+    &lt;listener&gt;
+        &lt;listener-class&gt;org.springframework.web.context.ContextLoaderListener&lt;/listener-class&gt;
+    &lt;/listener&gt;
+&lt;/web-app&gt;
+]]></script>
 </div></div>
 <p><b>Spring WEB-INF/applicationContext.xml</b></p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml"><span class="code-tag">&lt;?xml version=<span class="code-quote">"1.0"</span> encoding=<span class="code-quote">"UTF-8"</span> ?&gt;</span>
-<span class="code-tag">&lt;!DOCTYPE beans PUBLIC <span class="code-quote">"-//SPRING//DTD BEAN//EN"</span> <span class="code-quote">"http://www.springframework.org/dtd/spring-beans.dtd"</span>&gt;</span>
-<span class="code-tag">&lt;beans&gt;</span>
-    <span class="code-tag">&lt;bean id=<span class="code-quote">"brokerService"</span> class=<span class="code-quote">"org.apache.activemq.xbean.BrokerFactoryBean"</span>&gt;</span>
-        <span class="code-tag">&lt;property name=<span class="code-quote">"config"</span> value=<span class="code-quote">"classpath:activemq-config.xml"</span>/&gt;</span>
-    <span class="code-tag">&lt;/bean&gt;</span>
-<span class="code-tag">&lt;/beans&gt;</span>
-</pre>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;?xml version="1.0" encoding="UTF-8" ?&gt;
+&lt;!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"&gt;
+&lt;beans&gt;
+    &lt;bean id="brokerService" class="org.apache.activemq.xbean.BrokerFactoryBean"&gt;
+        &lt;property name="config" value="classpath:activemq-config.xml"/&gt;
+    &lt;/bean&gt;
+&lt;/beans&gt;
+]]></script>
 </div></div>
 <p>Again, the <tt>web.xml</tt> listener starts Spring and reads the Spring <tt>META-INF/applicationContext.xml</tt> file (the default location used by the <tt>ContextLoaderListener</tt>), and the <tt>applicationContext.xml</tt> indicates that the ActiveMQ configuration file should be read from the class path with the name <tt>activemq-config.xml</tt>.  That file could be placed in <tt>WEB-INF/classes</tt> or in a directory on the file system that is added to the WebLogic class path (for ease of editing).</p>
 
@@ -248,44 +261,45 @@ An ActiveMQ broker may be run within Web
 <p>This class is an ActiveMQ "plugin", which installs two filters (authorization and authentication) which will be invoked on every request.  This is similar to the default behavior provided by ActiveMQ's <tt>JaasAuthenticationPlugin</tt> and <tt>AuthorizationPlugin</tt>.</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[
+/**
  * An ActiveMQ security plugin that installs two security filters
  * (authentication and authorization) that use WebLogic security realms to
  * handle the login and provide user and group principals.
  */
-<span class="code-keyword">public</span> class ActiveMQToWebLogicSecurity <span class="code-keyword">implements</span> BrokerPlugin {
-    <span class="code-keyword">private</span> <span class="code-object">String</span> authorizedGroup;
+public class ActiveMQToWebLogicSecurity implements BrokerPlugin {
+    private String authorizedGroup;
 
-    <span class="code-keyword">public</span> Broker installPlugin(Broker broker) {
-        <span class="code-comment">// Install the first filter <span class="code-keyword">for</span> authentication
-</span>        Broker first = <span class="code-keyword">new</span> ActiveMQWebLogicAuthenticationFilter(broker);
-        <span class="code-comment">// Configure and install the second filter <span class="code-keyword">for</span> authorization
-</span>        AuthorizationEntry entry = <span class="code-keyword">new</span> AuthorizationEntry();
-        Set acls = <span class="code-keyword">new</span> HashSet();
-        acls.add(<span class="code-keyword">new</span> WLSGroupImpl(authorizedGroup));
+    public Broker installPlugin(Broker broker) {
+        // Install the first filter for authentication
+        Broker first = new ActiveMQWebLogicAuthenticationFilter(broker);
+        // Configure and install the second filter for authorization
+        AuthorizationEntry entry = new AuthorizationEntry();
+        Set acls = new HashSet();
+        acls.add(new WLSGroupImpl(authorizedGroup));
         entry.setAdminACLs(acls);
         entry.setReadACLs(acls);
         entry.setWriteACLs(acls);
-        DefaultAuthorizationMap map = <span class="code-keyword">new</span> DefaultAuthorizationMap();
+        DefaultAuthorizationMap map = new DefaultAuthorizationMap();
         map.setDefaultEntry(entry);
-        <span class="code-comment">//todo: <span class="code-keyword">if</span> finer-grained access is required, add more entries to the authorization map
-</span>        Broker second = <span class="code-keyword">new</span> AuthorizationBroker(first, map);
-        <span class="code-keyword">return</span> second;
+        //todo: if finer-grained access is required, add more entries to the authorization map
+        Broker second = new AuthorizationBroker(first, map);
+        return second;
     }
 
-    <span class="code-keyword">public</span> <span class="code-object">String</span> getAuthorizedGroup() {
-        <span class="code-keyword">return</span> authorizedGroup;
+    public String getAuthorizedGroup() {
+        return authorizedGroup;
     }
 
     /**
      * Called by XBean at configuration time to set the authorized group from a
      * property in the main ActiveMQ configuration file.
      */
-    <span class="code-keyword">public</span> void setAuthorizedGroup(<span class="code-object">String</span> authorizedGroup) {
-        <span class="code-keyword">this</span>.authorizedGroup = authorizedGroup;
+    public void setAuthorizedGroup(String authorizedGroup) {
+        this.authorizedGroup = authorizedGroup;
     }
 }
-</pre>
+]]></script>
 </div></div>
 
 <p>The second class is the authentication filter used by the class above to authenticate all logins against the WebLogic default security realm.</p>
@@ -293,9 +307,10 @@ An ActiveMQ broker may be run within Web
 <p><b>ActiveMQWebLogicAuthenticationFilter.java</b></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[
+/**
  * A broker filter that authenticates callers against WebLogic security.
- * This is similar to the ActiveMQ JaasAuthenticationBroker except <span class="code-keyword">for</span> two
+ * This is similar to the ActiveMQ JaasAuthenticationBroker except for two
  * things:
  * &lt;ul&gt;
  *   &lt;li&gt;Instead of reading a JAAS configuration file, it hardcodes the JAAS
@@ -303,41 +318,41 @@ An ActiveMQ broker may be run within Web
  *
  *   &lt;li&gt;The SecurityContext implementation overrides the method used to
  *     compare actual and eligible principals in order to handle the fact
- *     that WebLogic principals (WLSGroupImpl in particular) <span class="code-keyword">do</span> not seem
- *     to match according to equals and hashCode even <span class="code-keyword">if</span> the principal class
- *     and principal name are the same (perhaps having to <span class="code-keyword">do</span> with the
+ *     that WebLogic principals (WLSGroupImpl in particular) do not seem
+ *     to match according to equals and hashCode even if the principal class
+ *     and principal name are the same (perhaps having to do with the
  *     signature data on the WLSAbstractPrincipal).&lt;/li&gt;
  * &lt;/ul&gt;
  */
-<span class="code-keyword">public</span> class ActiveMQWebLogicAuthenticationFilter <span class="code-keyword">extends</span> BrokerFilter {
-    <span class="code-keyword">private</span> <span class="code-keyword">final</span> <span class="code-keyword">static</span> Configuration WEBLOGIC_JAAS_CONFIGURATION = <span class="code-keyword">new</span> Configuration() {
-        <span class="code-keyword">public</span> AppConfigurationEntry[] getAppConfigurationEntry(<span class="code-object">String</span> name) {
-            <span class="code-keyword">return</span> <span class="code-keyword">new</span> AppConfigurationEntry[]{
-                    <span class="code-keyword">new</span> AppConfigurationEntry(<span class="code-quote">"weblogic.security.auth.login.UsernamePasswordLoginModule"</span>,
+public class ActiveMQWebLogicAuthenticationFilter extends BrokerFilter {
+    private final static Configuration WEBLOGIC_JAAS_CONFIGURATION = new Configuration() {
+        public AppConfigurationEntry[] getAppConfigurationEntry(String name) {
+            return new AppConfigurationEntry[]{
+                    new AppConfigurationEntry("weblogic.security.auth.login.UsernamePasswordLoginModule",
                             AppConfigurationEntry.LoginModuleControlFlag.REQUIRED, Collections.EMPTY_MAP)
             };
         }
 
-        <span class="code-keyword">public</span> void refresh() {
+        public void refresh() {
         }
     };
-    <span class="code-keyword">private</span> <span class="code-keyword">final</span> CopyOnWriteArrayList securityContexts = <span class="code-keyword">new</span> CopyOnWriteArrayList();
+    private final CopyOnWriteArrayList securityContexts = new CopyOnWriteArrayList();
 
-    <span class="code-keyword">public</span> ActiveMQWebLogicAuthenticationFilter(Broker next) {
-        <span class="code-keyword">super</span>(next);
+    public ActiveMQWebLogicAuthenticationFilter(Broker next) {
+        super(next);
     }
 
-    <span class="code-keyword">static</span> class JaasSecurityContext <span class="code-keyword">extends</span> SecurityContext {
+    static class JaasSecurityContext extends SecurityContext {
 
-        <span class="code-keyword">private</span> <span class="code-keyword">final</span> Subject subject;
+        private final Subject subject;
 
-        <span class="code-keyword">public</span> JaasSecurityContext(<span class="code-object">String</span> userName, Subject subject) {
-            <span class="code-keyword">super</span>(userName);
-            <span class="code-keyword">this</span>.subject = subject;
+        public JaasSecurityContext(String userName, Subject subject) {
+            super(userName);
+            this.subject = subject;
         }
 
-        <span class="code-keyword">public</span> Set getPrincipals() {
-            <span class="code-keyword">return</span> subject.getPrincipals();
+        public Set getPrincipals() {
+            return subject.getPrincipals();
         }
 
         /**
@@ -346,45 +361,45 @@ An ActiveMQ broker may be run within Web
          * supports).  We skip that test because ActiveMQ does not sign the principals
          * it deals with.
          */
-        <span class="code-keyword">public</span> <span class="code-object">boolean</span> isInOneOf(Set eligiblePrincipals) {
-            <span class="code-keyword">for</span> (Iterator it = getPrincipals().iterator(); it.hasNext();) {
+        public boolean isInOneOf(Set eligiblePrincipals) {
+            for (Iterator it = getPrincipals().iterator(); it.hasNext();) {
                 Principal test = (Principal) it.next();
-                <span class="code-keyword">for</span> (Iterator el = eligiblePrincipals.iterator(); el.hasNext();) {
+                for (Iterator el = eligiblePrincipals.iterator(); el.hasNext();) {
                     Principal eligible = (Principal) el.next();
-                    <span class="code-keyword">if</span>(test.getName().equals(eligible.getName()) &amp;&amp;
+                    if(test.getName().equals(eligible.getName()) &amp;&amp;
                             test.getClass().getName().equals(eligible.getClass().getName())) {
-                        <span class="code-keyword">return</span> <span class="code-keyword">true</span>;
+                        return true;
                     }
                 }
             }
-            <span class="code-keyword">return</span> <span class="code-keyword">false</span>;
+            return false;
         }
     }
 
-    <span class="code-keyword">public</span> void addConnection(ConnectionContext context, ConnectionInfo info) <span class="code-keyword">throws</span> Exception {
-        <span class="code-keyword">if</span>( context.getSecurityContext()==<span class="code-keyword">null</span> ) {
-            <span class="code-comment">// Do the login.
-</span>            <span class="code-keyword">try</span> {
-                LoginContext lc = <span class="code-keyword">new</span> LoginContext(<span class="code-quote">"ActiveMQ"</span>, <span class="code-keyword">new</span> Subject(),
-                        <span class="code-keyword">new</span> URLCallbackHandler(info.getUserName(), info.getPassword()),
+    public void addConnection(ConnectionContext context, ConnectionInfo info) throws Exception {
+        if( context.getSecurityContext()==null ) {
+            // Do the login.
+            try {
+                LoginContext lc = new LoginContext("ActiveMQ", new Subject(),
+                        new URLCallbackHandler(info.getUserName(), info.getPassword()),
                         WEBLOGIC_JAAS_CONFIGURATION);
                 lc.login();
                 Subject subject = lc.getSubject();
 
-                SecurityContext s = <span class="code-keyword">new</span> JaasSecurityContext(info.getUserName(), subject);
+                SecurityContext s = new JaasSecurityContext(info.getUserName(), subject);
                 context.setSecurityContext(s);
                 securityContexts.add(s);
-            } <span class="code-keyword">catch</span> (Exception e) {
-                <span class="code-keyword">throw</span> (SecurityException)<span class="code-keyword">new</span> SecurityException(<span class="code-quote">"User name or password is invalid."</span>).initCause(e);
+            } catch (Exception e) {
+                throw (SecurityException)new SecurityException("User name or password is invalid.").initCause(e);
             }
         }
-        <span class="code-keyword">super</span>.addConnection(context, info);
+        super.addConnection(context, info);
     }
 
-    <span class="code-keyword">public</span> void removeConnection(ConnectionContext context, ConnectionInfo info, Throwable error) <span class="code-keyword">throws</span> Exception {
-        <span class="code-keyword">super</span>.removeConnection(context, info, error);
-        <span class="code-keyword">if</span>( securityContexts.remove(context.getSecurityContext()) ) {
-            context.setSecurityContext(<span class="code-keyword">null</span>);
+    public void removeConnection(ConnectionContext context, ConnectionInfo info, Throwable error) throws Exception {
+        super.removeConnection(context, info, error);
+        if( securityContexts.remove(context.getSecurityContext()) ) {
+            context.setSecurityContext(null);
         }
     }
 
@@ -392,15 +407,15 @@ An ActiveMQ broker may be run within Web
      * Previously logged in users may no longer have the same access anymore.  Refresh
      * all the logged into users.
      */
-    <span class="code-keyword">public</span> void refresh() {
-        <span class="code-keyword">for</span> (Iterator iter = securityContexts.iterator(); iter.hasNext();) {
+    public void refresh() {
+        for (Iterator iter = securityContexts.iterator(); iter.hasNext();) {
             SecurityContext sc = (SecurityContext) iter.next();
             sc.getAuthorizedReadDests().clear();
             sc.getAuthorizedWriteDests().clear();
         }
     }
 }
-</pre>
+]]></script>
 </div></div>
 
 <h5><a shape="rect" name="WebLogicIntegration-SampleActiveMQConfigurationFiles"></a>Sample ActiveMQ Configuration Files</h5>
@@ -411,190 +426,194 @@ An ActiveMQ broker may be run within Web
 
 <p><b>Single Broker</b></p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml"><span class="code-tag">&lt;?xml version=<span class="code-quote">"1.0"</span> encoding=<span class="code-quote">"UTF-8"</span>?&gt;</span>
-<span class="code-tag">&lt;beans xmlns=<span class="code-quote">"http://activemq.org/config/1.0"</span>&gt;</span>
-  <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>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+&lt;beans xmlns="http://activemq.org/config/1.0"&gt;
+  &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;broker useJmx=<span class="code-quote">"true"</span> brokerName=<span class="code-quote">"MyBroker"</span> useShutdownHook=<span class="code-quote">"false"</span>
-          plugins=<span class="code-quote">"#WebLogicSecurity"</span>&gt;
+  &lt;broker useJmx="true" brokerName="MyBroker" useShutdownHook="false"
+          plugins="#WebLogicSecurity"&gt;
 
-    <span class="code-tag"><span class="code-comment">&lt;!-- Register all ActiveMQ MBeans with the WebLogic runtime MBeanServer --&gt;</span></span>
-    <span class="code-tag">&lt;managementContext&gt;</span>
-      <span class="code-tag">&lt;managementContext&gt;</span>
-          <span class="code-tag">&lt;MBeanServer&gt;</span>
-             <span class="code-tag">&lt;bean class=<span class="code-quote">"org.springframework.jndi.JndiObjectFactoryBean"</span> xmlns=""&gt;</span>
-                <span class="code-tag">&lt;property name=<span class="code-quote">"jndiName"</span> value=<span class="code-quote">"java:comp/env/jmx/runtime"</span> /&gt;</span>
-                <span class="code-tag">&lt;property name=<span class="code-quote">"lookupOnStartup"</span> value=<span class="code-quote">"true"</span> /&gt;</span>
-                <span class="code-tag">&lt;property name=<span class="code-quote">"expectedType"</span> value=<span class="code-quote">"javax.management.MBeanServer"</span> /&gt;</span>
-             <span class="code-tag">&lt;/bean&gt;</span>
-          <span class="code-tag">&lt;/MBeanServer&gt;</span>
-      <span class="code-tag">&lt;/managementContext&gt;</span>
-    <span class="code-tag">&lt;/managementContext&gt;</span>
+    &lt;!-- Register all ActiveMQ MBeans with the WebLogic runtime MBeanServer --&gt;
+    &lt;managementContext&gt;
+      &lt;managementContext&gt;
+          &lt;MBeanServer&gt;
+             &lt;bean class="org.springframework.jndi.JndiObjectFactoryBean" xmlns=""&gt;
+                &lt;property name="jndiName" value="java:comp/env/jmx/runtime" /&gt;
+                &lt;property name="lookupOnStartup" value="true" /&gt;
+                &lt;property name="expectedType" value="javax.management.MBeanServer" /&gt;
+             &lt;/bean&gt;
+          &lt;/MBeanServer&gt;
+      &lt;/managementContext&gt;
+    &lt;/managementContext&gt;
   
-    <span class="code-tag">&lt;persistenceAdapter&gt;</span>
-      <span class="code-tag"><span class="code-comment">&lt;!-- By default, use an embedded Derby database --&gt;</span></span>
-        &lt;journaledJDBC journalLogFiles=<span class="code-quote">"5"</span>
-                       dataDirectory=<span class="code-quote">"/server/bea/weblogic920/domains/jms/activemq-data"</span>/&gt;
+    &lt;persistenceAdapter&gt;
+      &lt;!-- By default, use an embedded Derby database --&gt;
+        &lt;journaledJDBC journalLogFiles="5"
+                       dataDirectory="/server/bea/weblogic920/domains/jms/activemq-data"/&gt;
       &lt;!-- Use this with the WebLogicDataSource below to use a WebLogic
            database connection pool instead of the embedded Derby database
-        &lt;journaledJDBC journalLogFiles=<span class="code-quote">"5"</span>
-                       dataDirectory=<span class="code-quote">"/server/bea/weblogic920/domains/jms/activemq-data"</span>
-                       dataSource=<span class="code-quote">"#WebLogicDataSource"</span> /&gt;
+        &lt;journaledJDBC journalLogFiles="5"
+                       dataDirectory="/server/bea/weblogic920/domains/jms/activemq-data"
+                       dataSource="#WebLogicDataSource" /&gt;
 
       --&gt;
-    <span class="code-tag">&lt;/persistenceAdapter&gt;</span>
+    &lt;/persistenceAdapter&gt;
   
-    <span class="code-tag">&lt;transportConnectors&gt;</span>
-        <span class="code-tag">&lt;transportConnector name=<span class="code-quote">"MyBrokerTCP"</span> uri=<span class="code-quote">"tcp://0.0.0.0:61616"</span> /&gt;</span>
-    <span class="code-tag">&lt;/transportConnectors&gt;</span>
-  <span class="code-tag">&lt;/broker&gt;</span>
-
-  &lt;bean id=<span class="code-quote">"WebLogicSecurity"</span>
-        class=<span class="code-quote">"com.example.activemq.weblogic.ActiveMQToWebLogicSecurity"</span>&gt;
-      <span class="code-tag">&lt;property name=<span class="code-quote">"authorizedGroup"</span> value=<span class="code-quote">"ActiveMQUsers"</span> /&gt;</span>
-  <span class="code-tag">&lt;/bean&gt;</span>
+    &lt;transportConnectors&gt;
+        &lt;transportConnector name="MyBrokerTCP" uri="tcp://0.0.0.0:61616" /&gt;
+    &lt;/transportConnectors&gt;
+  &lt;/broker&gt;
+
+  &lt;bean id="WebLogicSecurity"
+        class="com.example.activemq.weblogic.ActiveMQToWebLogicSecurity"&gt;
+      &lt;property name="authorizedGroup" value="ActiveMQUsers" /&gt;
+  &lt;/bean&gt;
 
 &lt;!-- Uncomment and configure this if you want to use a WebLogic database
      connection pool for persistent messages
-  &lt;bean id=<span class="code-quote">"WebLogicDataSource"</span>
-        class=<span class="code-quote">"org.springframework.jndi.JndiObjectFactoryBean"</span>&gt;
-     <span class="code-tag">&lt;property name=<span class="code-quote">"jndiName"</span> value=<span class="code-quote">"db/pool/jndi/name"</span>/&gt;</span>
-  <span class="code-tag">&lt;/bean&gt;</span>
+  &lt;bean id="WebLogicDataSource"
+        class="org.springframework.jndi.JndiObjectFactoryBean"&gt;
+     &lt;property name="jndiName" value="db/pool/jndi/name"/&gt;
+  &lt;/bean&gt;
 --&gt;
-<span class="code-tag">&lt;/beans&gt;</span>
-</pre>
+&lt;/beans&gt;
+]]></script>
 </div></div>
 
 <p><b>Network of Brokers (Broker 1/2)</b></p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml"><span class="code-tag">&lt;?xml version=<span class="code-quote">"1.0"</span> encoding=<span class="code-quote">"UTF-8"</span>?&gt;</span>
-<span class="code-tag">&lt;beans xmlns=<span class="code-quote">"http://activemq.org/config/1.0"</span>&gt;</span>
-  <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>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+&lt;beans xmlns="http://activemq.org/config/1.0"&gt;
+  &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;broker useJmx=<span class="code-quote">"true"</span> brokerName=<span class="code-quote">"FirstBroker"</span> useShutdownHook=<span class="code-quote">"false"</span>
-          plugins=<span class="code-quote">"#WebLogicSecurity"</span>&gt;
+  &lt;broker useJmx="true" brokerName="FirstBroker" useShutdownHook="false"
+          plugins="#WebLogicSecurity"&gt;
 
-    <span class="code-tag"><span class="code-comment">&lt;!-- Register all ActiveMQ MBeans with the WebLogic runtime MBeanServer --&gt;</span></span>
-    <span class="code-tag">&lt;managementContext&gt;</span>
-      <span class="code-tag">&lt;managementContext&gt;</span>
-          <span class="code-tag">&lt;MBeanServer&gt;</span>
-             <span class="code-tag">&lt;bean class=<span class="code-quote">"org.springframework.jndi.JndiObjectFactoryBean"</span> xmlns=""&gt;</span>
-                <span class="code-tag">&lt;property name=<span class="code-quote">"jndiName"</span> value=<span class="code-quote">"java:comp/env/jmx/runtime"</span> /&gt;</span>
-                <span class="code-tag">&lt;property name=<span class="code-quote">"lookupOnStartup"</span> value=<span class="code-quote">"true"</span> /&gt;</span>
-                <span class="code-tag">&lt;property name=<span class="code-quote">"expectedType"</span> value=<span class="code-quote">"javax.management.MBeanServer"</span> /&gt;</span>
-             <span class="code-tag">&lt;/bean&gt;</span>
-          <span class="code-tag">&lt;/MBeanServer&gt;</span>
-      <span class="code-tag">&lt;/managementContext&gt;</span>
-    <span class="code-tag">&lt;/managementContext&gt;</span>
+    &lt;!-- Register all ActiveMQ MBeans with the WebLogic runtime MBeanServer --&gt;
+    &lt;managementContext&gt;
+      &lt;managementContext&gt;
+          &lt;MBeanServer&gt;
+             &lt;bean class="org.springframework.jndi.JndiObjectFactoryBean" xmlns=""&gt;
+                &lt;property name="jndiName" value="java:comp/env/jmx/runtime" /&gt;
+                &lt;property name="lookupOnStartup" value="true" /&gt;
+                &lt;property name="expectedType" value="javax.management.MBeanServer" /&gt;
+             &lt;/bean&gt;
+          &lt;/MBeanServer&gt;
+      &lt;/managementContext&gt;
+    &lt;/managementContext&gt;
   
-    <span class="code-tag">&lt;persistenceAdapter&gt;</span>
-      <span class="code-tag"><span class="code-comment">&lt;!-- By default, use an embedded Derby database --&gt;</span></span>
-        &lt;journaledJDBC journalLogFiles=<span class="code-quote">"5"</span>
-                       dataDirectory=<span class="code-quote">"/server/bea/weblogic920/domains/jms/activemq-b1-data"</span>/&gt;
+    &lt;persistenceAdapter&gt;
+      &lt;!-- By default, use an embedded Derby database --&gt;
+        &lt;journaledJDBC journalLogFiles="5"
+                       dataDirectory="/server/bea/weblogic920/domains/jms/activemq-b1-data"/&gt;
       &lt;!-- Use this with the WebLogicDataSource below to use a WebLogic
            database connection pool instead of the embedded Derby database
-        &lt;journaledJDBC journalLogFiles=<span class="code-quote">"5"</span>
-                       dataDirectory=<span class="code-quote">"/server/bea/weblogic920/domains/jms/activemq-b1-data"</span>
-                       dataSource=<span class="code-quote">"#WebLogicDataSource"</span> /&gt;
+        &lt;journaledJDBC journalLogFiles="5"
+                       dataDirectory="/server/bea/weblogic920/domains/jms/activemq-b1-data"
+                       dataSource="#WebLogicDataSource" /&gt;
 
       --&gt;
-    <span class="code-tag">&lt;/persistenceAdapter&gt;</span>
+    &lt;/persistenceAdapter&gt;
   
-    <span class="code-tag">&lt;transportConnectors&gt;</span>
-        <span class="code-tag">&lt;transportConnector name=<span class="code-quote">"FirstBrokerTCP"</span> uri=<span class="code-quote">"tcp://0.0.0.0:60010"</span> /&gt;</span>
-    <span class="code-tag">&lt;/transportConnectors&gt;</span>
+    &lt;transportConnectors&gt;
+        &lt;transportConnector name="FirstBrokerTCP" uri="tcp://0.0.0.0:60010" /&gt;
+    &lt;/transportConnectors&gt;
     
-    <span class="code-tag">&lt;networkConnectors&gt;</span>
-        &lt;networkConnector name=<span class="code-quote">"Broker1ToBroker2"</span>
-                          uri=<span class="code-quote">"static://(tcp://localhost:60011)"</span> failover=<span class="code-quote">"true"</span>
-                          userName=<span class="code-quote">"fixme"</span> password=<span class="code-quote">"fixme"</span>/&gt;
-    <span class="code-tag">&lt;/networkConnectors&gt;</span>
-  <span class="code-tag">&lt;/broker&gt;</span>
-
-  &lt;bean id=<span class="code-quote">"WebLogicSecurity"</span>
-        class=<span class="code-quote">"com.example.activemq.weblogic.ActiveMQToWebLogicSecurity"</span>&gt;
-      <span class="code-tag">&lt;property name=<span class="code-quote">"authorizedGroup"</span> value=<span class="code-quote">"ActiveMQUsers"</span> /&gt;</span>
-  <span class="code-tag">&lt;/bean&gt;</span>
+    &lt;networkConnectors&gt;
+        &lt;networkConnector name="Broker1ToBroker2"
+                          uri="static://(tcp://localhost:60011)" failover="true"
+                          userName="fixme" password="fixme"/&gt;
+    &lt;/networkConnectors&gt;
+  &lt;/broker&gt;
+
+  &lt;bean id="WebLogicSecurity"
+        class="com.example.activemq.weblogic.ActiveMQToWebLogicSecurity"&gt;
+      &lt;property name="authorizedGroup" value="ActiveMQUsers" /&gt;
+  &lt;/bean&gt;
 
 &lt;!-- Uncomment and configure this if you want to use a WebLogic database
      connection pool for persistent messages
-  &lt;bean id=<span class="code-quote">"WebLogicDataSource"</span>
-        class=<span class="code-quote">"org.springframework.jndi.JndiObjectFactoryBean"</span>&gt;
-     <span class="code-tag">&lt;property name=<span class="code-quote">"jndiName"</span> value=<span class="code-quote">"db/pool/jndi/name"</span>/&gt;</span>
-  <span class="code-tag">&lt;/bean&gt;</span>
+  &lt;bean id="WebLogicDataSource"
+        class="org.springframework.jndi.JndiObjectFactoryBean"&gt;
+     &lt;property name="jndiName" value="db/pool/jndi/name"/&gt;
+  &lt;/bean&gt;
 --&gt;
-<span class="code-tag">&lt;/beans&gt;</span>
-</pre>
+&lt;/beans&gt;
+]]></script>
 </div></div>
 
 <p><b>Network of Brokers (Broker 2/2)</b></p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml"><span class="code-tag">&lt;?xml version=<span class="code-quote">"1.0"</span> encoding=<span class="code-quote">"UTF-8"</span>?&gt;</span>
-<span class="code-tag">&lt;beans xmlns=<span class="code-quote">"http://activemq.org/config/1.0"</span>&gt;</span>
-  <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>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+&lt;beans xmlns="http://activemq.org/config/1.0"&gt;
+  &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;broker useJmx=<span class="code-quote">"true"</span> brokerName=<span class="code-quote">"SecondBroker"</span> useShutdownHook=<span class="code-quote">"false"</span>
-          plugins=<span class="code-quote">"#WebLogicSecurity"</span>&gt;
+  &lt;broker useJmx="true" brokerName="SecondBroker" useShutdownHook="false"
+          plugins="#WebLogicSecurity"&gt;
 
-    <span class="code-tag"><span class="code-comment">&lt;!-- Register all ActiveMQ MBeans with the WebLogic runtime MBeanServer --&gt;</span></span>
-    <span class="code-tag">&lt;managementContext&gt;</span>
-      <span class="code-tag">&lt;managementContext&gt;</span>
-          <span class="code-tag">&lt;MBeanServer&gt;</span>
-             <span class="code-tag">&lt;bean class=<span class="code-quote">"org.springframework.jndi.JndiObjectFactoryBean"</span> xmlns=""&gt;</span>
-                <span class="code-tag">&lt;property name=<span class="code-quote">"jndiName"</span> value=<span class="code-quote">"java:comp/env/jmx/runtime"</span> /&gt;</span>
-                <span class="code-tag">&lt;property name=<span class="code-quote">"lookupOnStartup"</span> value=<span class="code-quote">"true"</span> /&gt;</span>
-                <span class="code-tag">&lt;property name=<span class="code-quote">"expectedType"</span> value=<span class="code-quote">"javax.management.MBeanServer"</span> /&gt;</span>
-             <span class="code-tag">&lt;/bean&gt;</span>
-          <span class="code-tag">&lt;/MBeanServer&gt;</span>
-      <span class="code-tag">&lt;/managementContext&gt;</span>
-    <span class="code-tag">&lt;/managementContext&gt;</span>
+    &lt;!-- Register all ActiveMQ MBeans with the WebLogic runtime MBeanServer --&gt;
+    &lt;managementContext&gt;
+      &lt;managementContext&gt;
+          &lt;MBeanServer&gt;
+             &lt;bean class="org.springframework.jndi.JndiObjectFactoryBean" xmlns=""&gt;
+                &lt;property name="jndiName" value="java:comp/env/jmx/runtime" /&gt;
+                &lt;property name="lookupOnStartup" value="true" /&gt;
+                &lt;property name="expectedType" value="javax.management.MBeanServer" /&gt;
+             &lt;/bean&gt;
+          &lt;/MBeanServer&gt;
+      &lt;/managementContext&gt;
+    &lt;/managementContext&gt;
   
-    <span class="code-tag">&lt;persistenceAdapter&gt;</span>
-      <span class="code-tag"><span class="code-comment">&lt;!-- By default, use an embedded Derby database --&gt;</span></span>
-        &lt;journaledJDBC journalLogFiles=<span class="code-quote">"5"</span>
-                       dataDirectory=<span class="code-quote">"/server/bea/weblogic920/domains/jms/activemq-b2-data"</span>/&gt;
+    &lt;persistenceAdapter&gt;
+      &lt;!-- By default, use an embedded Derby database --&gt;
+        &lt;journaledJDBC journalLogFiles="5"
+                       dataDirectory="/server/bea/weblogic920/domains/jms/activemq-b2-data"/&gt;
       &lt;!-- Use this with the WebLogicDataSource below to use a WebLogic
            database connection pool instead of the embedded Derby database
-        &lt;journaledJDBC journalLogFiles=<span class="code-quote">"5"</span>
-                       dataDirectory=<span class="code-quote">"/server/bea/weblogic920/domains/jms/activemq-b2-data"</span>
-                       dataSource=<span class="code-quote">"#WebLogicDataSource"</span> /&gt;
+        &lt;journaledJDBC journalLogFiles="5"
+                       dataDirectory="/server/bea/weblogic920/domains/jms/activemq-b2-data"
+                       dataSource="#WebLogicDataSource" /&gt;
 
       --&gt;
-    <span class="code-tag">&lt;/persistenceAdapter&gt;</span>
+    &lt;/persistenceAdapter&gt;
   
-    <span class="code-tag">&lt;transportConnectors&gt;</span>
-        <span class="code-tag">&lt;transportConnector name=<span class="code-quote">"SecondBrokerTCP"</span> uri=<span class="code-quote">"tcp://0.0.0.0:60011"</span> /&gt;</span>
-    <span class="code-tag">&lt;/transportConnectors&gt;</span>
+    &lt;transportConnectors&gt;
+        &lt;transportConnector name="SecondBrokerTCP" uri="tcp://0.0.0.0:60011" /&gt;
+    &lt;/transportConnectors&gt;
     
-    <span class="code-tag">&lt;networkConnectors&gt;</span>
-        &lt;networkConnector name=<span class="code-quote">"Broker2ToBroker1"</span>
-                          uri=<span class="code-quote">"static://(tcp://localhost:60010)"</span> failover=<span class="code-quote">"true"</span>
-                          userName=<span class="code-quote">"fixme"</span> password=<span class="code-quote">"fixme"</span> /&gt;
-    <span class="code-tag">&lt;/networkConnectors&gt;</span>
-  <span class="code-tag">&lt;/broker&gt;</span>
-
-  &lt;bean id=<span class="code-quote">"WebLogicSecurity"</span>
-        class=<span class="code-quote">"com.example.activemq.weblogic.ActiveMQToWebLogicSecurity"</span>&gt;
-      <span class="code-tag">&lt;property name=<span class="code-quote">"authorizedGroup"</span> value=<span class="code-quote">"activemq"</span> /&gt;</span>
-  <span class="code-tag">&lt;/bean&gt;</span>
+    &lt;networkConnectors&gt;
+        &lt;networkConnector name="Broker2ToBroker1"
+                          uri="static://(tcp://localhost:60010)" failover="true"
+                          userName="fixme" password="fixme" /&gt;
+    &lt;/networkConnectors&gt;
+  &lt;/broker&gt;
+
+  &lt;bean id="WebLogicSecurity"
+        class="com.example.activemq.weblogic.ActiveMQToWebLogicSecurity"&gt;
+      &lt;property name="authorizedGroup" value="activemq" /&gt;
+  &lt;/bean&gt;
 
 &lt;!-- Uncomment and configure this if you want to use a WebLogic database
      connection pool for persistent messages
-  &lt;bean id=<span class="code-quote">"WebLogicDataSource"</span>
-        class=<span class="code-quote">"org.springframework.jndi.JndiObjectFactoryBean"</span>&gt;
-     <span class="code-tag">&lt;property name=<span class="code-quote">"jndiName"</span> value=<span class="code-quote">"db/pool/jndi/name"</span>/&gt;</span>
-  <span class="code-tag">&lt;/bean&gt;</span>
+  &lt;bean id="WebLogicDataSource"
+        class="org.springframework.jndi.JndiObjectFactoryBean"&gt;
+     &lt;property name="jndiName" value="db/pool/jndi/name"/&gt;
+  &lt;/bean&gt;
 --&gt;
-<span class="code-tag">&lt;/beans&gt;</span>
-</pre>
+&lt;/beans&gt;
+]]></script>
 </div></div>
 
 <p><b>Log4J Configuration File (<tt>log4j.properties</tt>)</b></p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java"># Can change <span class="code-keyword">this</span> to <span class="code-quote">"INFO, out"</span> or <span class="code-quote">"INFO, out, stdout"</span>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+# Can change this to "INFO, out" or "INFO, out, stdout"
 # to enable logging to the file defined down below
 log4j.rootLogger=INFO, stdout
 log4j.logger.org.apache.activemq.spring=WARN
@@ -607,15 +626,15 @@ log4j.appender.stdout.layout=org.apache.
 log4j.appender.stdout.layout.ConversionPattern=%-5p %-30.30c{1} - %m%n
 log4j.appender.stdout.threshold=INFO
 
-# Configuration <span class="code-keyword">for</span> a log file (in addition to or instead of stdout)
+# Configuration for a log file (in addition to or instead of stdout)
 log4j.appender.out=org.apache.log4j.RollingFileAppender
 log4j.appender.out.file=/server/bea/weblogic920/domains/test/activemq.log
 log4j.appender.out.maxFileSize=1024KB
 log4j.appender.out.maxBackupIndex=5
-log4j.appender.out.append=<span class="code-keyword">true</span>
+log4j.appender.out.append=true
 log4j.appender.out.layout=org.apache.log4j.PatternLayout
 log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-</pre>
+]]></script>
 </div></div>
 
 <h4><a shape="rect" name="WebLogicIntegration-InstallationProcedure"></a>Installation Procedure</h4>
@@ -669,8 +688,8 @@ INFO  BrokerService                  - A
 
 <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/websockets.html
==============================================================================
--- websites/production/activemq/content/websockets.html (original)
+++ websites/production/activemq/content/websockets.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; -- WebSockets
     </title>

Modified: websites/production/activemq/content/what-are-administered-objects.html
==============================================================================
--- websites/production/activemq/content/what-are-administered-objects.html (original)
+++ websites/production/activemq/content/what-are-administered-objects.html Fri Jul 12 12:46:14 2013
@@ -32,6 +32,7 @@
     </style>
     <![endif]-->
 
+    
     <title>
     Apache ActiveMQ &#8482; -- What are administered objects
     </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>
@@ -100,8 +101,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/what-are-those-topics-activemqadvisory.html
==============================================================================
--- websites/production/activemq/content/what-are-those-topics-activemqadvisory.html (original)
+++ websites/production/activemq/content/what-are-those-topics-activemqadvisory.html Fri Jul 12 12:46:14 2013
@@ -32,6 +32,7 @@
     </style>
     <![endif]-->
 
+    
     <title>
     Apache ActiveMQ &#8482; -- What are those topics ActiveMQ.Advisory
     </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>
@@ -86,8 +87,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/what-happens-when-the-journal-size-is-exceeded.html
==============================================================================
--- websites/production/activemq/content/what-happens-when-the-journal-size-is-exceeded.html (original)
+++ websites/production/activemq/content/what-happens-when-the-journal-size-is-exceeded.html Fri Jul 12 12:46:14 2013
@@ -32,6 +32,7 @@
     </style>
     <![endif]-->
 
+    
     <title>
     Apache ActiveMQ &#8482; -- What happens when the journal size is exceeded
     </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>
@@ -87,8 +88,8 @@ If the "preferred" size is exceeded then
 
 <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/what-happens-with-a-fast-producer-and-slow-consumer.html
==============================================================================
--- websites/production/activemq/content/what-happens-with-a-fast-producer-and-slow-consumer.html (original)
+++ websites/production/activemq/content/what-happens-with-a-fast-producer-and-slow-consumer.html Fri Jul 12 12:46:14 2013
@@ -32,6 +32,7 @@
     </style>
     <![endif]-->
 
+    
     <title>
     Apache ActiveMQ &#8482; -- What happens with a fast producer and slow consumer
     </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>
@@ -91,8 +92,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/what-is-activemq.html
==============================================================================
--- websites/production/activemq/content/what-is-activemq.html (original)
+++ websites/production/activemq/content/what-is-activemq.html Fri Jul 12 12:46:14 2013
@@ -32,6 +32,7 @@
     </style>
     <![endif]-->
 
+    
     <title>
     Apache ActiveMQ &#8482; -- What is ActiveMQ
     </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 @@ ActiveMQ is an open sourced implementati
 
 <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/what-is-the-difference-between-a-virtual-topic-and-a-composite-destination.html
==============================================================================
--- websites/production/activemq/content/what-is-the-difference-between-a-virtual-topic-and-a-composite-destination.html (original)
+++ websites/production/activemq/content/what-is-the-difference-between-a-virtual-topic-and-a-composite-destination.html Fri Jul 12 12:46:14 2013
@@ -32,6 +32,7 @@
     </style>
     <![endif]-->
 
+    
     <title>
     Apache ActiveMQ &#8482; -- What is the difference between a Virtual Topic and a Composite Destination
     </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>
@@ -97,8 +98,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/what-is-the-difference-between-discovery-multicast-and-zeroconf.html
==============================================================================
--- websites/production/activemq/content/what-is-the-difference-between-discovery-multicast-and-zeroconf.html (original)
+++ websites/production/activemq/content/what-is-the-difference-between-discovery-multicast-and-zeroconf.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; -- What is the difference between discovery, multicast and zeroconf
     </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,11 +89,11 @@
 <h3><a shape="rect" name="Whatisthedifferencebetweendiscovery%2Cmulticastandzeroconf-Broker"></a>Broker</h3>
 
 <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;networkConnectors&gt;
-     &lt;networkConnector name=<span class="code-quote">"<span class="code-keyword">default</span>"</span> uri=<span class="code-quote">"multicast:<span class="code-comment">//<span class="code-keyword">default</span>"</span>/&gt;
-</span>   &lt;/networkConnectors&gt;
-</pre>
+     &lt;networkConnector name="default" uri="multicast://default"/&gt;
+   &lt;/networkConnectors&gt;
+]]></script>
 </div></div>
 
 <p>The above configuration in the broker xml file will make it automatically establish network connectors to other brokers that advertise themselves on the multicast address: when this broker gets a discovery event from another broker, the event has information that enables it to establish network connector to that broker.</p>
@@ -92,11 +102,11 @@
 
 
 <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;transportConnectors&gt;
-      &lt;transportConnector name=<span class="code-quote">"<span class="code-keyword">default</span>"</span> uri=<span class="code-quote">"tcp:<span class="code-comment">//localhost:61616"</span> discoveryUri=<span class="code-quote">"multicast://<span class="code-keyword">default</span>"</span>/&gt;
-</span>   &lt;/transportConnectors&gt;
-</pre>
+      &lt;transportConnector name="default" uri="tcp://localhost:61616" discoveryUri="multicast://default"/&gt;
+   &lt;/transportConnectors&gt;
+]]></script>
 </div></div>
 
 <h3><a shape="rect" name="Whatisthedifferencebetweendiscovery%2Cmulticastandzeroconf-Client"></a>Client</h3>
@@ -105,11 +115,11 @@
 
 
 <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;transportConnectors&gt;
-      &lt;transportConnector name=<span class="code-quote">"<span class="code-keyword">default</span>"</span> uri=<span class="code-quote">"discovery:(multicast:<span class="code-comment">//<span class="code-keyword">default</span>)"</span>/&gt;
-</span>   &lt;/transportConnectors&gt;
-</pre>
+      &lt;transportConnector name="default" uri="discovery:(multicast://default)"/&gt;
+   &lt;/transportConnectors&gt;
+]]></script>
 </div></div>
 
 <p>ps: discovery (which is a confusing name) is just like a 'reliable' transport such as <a shape="rect" href="failover-transport-reference.html" title="Failover Transport Reference">failover</a>. If it is unable to connect to a broker, it will try another broker (assuming it<br clear="none">
@@ -127,8 +137,8 @@ heard its advertisement over multicast).
 
 <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/what-is-the-difference-between-persistent-and-non-persistent-delivery.html
==============================================================================
--- websites/production/activemq/content/what-is-the-difference-between-persistent-and-non-persistent-delivery.html (original)
+++ websites/production/activemq/content/what-is-the-difference-between-persistent-and-non-persistent-delivery.html Fri Jul 12 12:46:14 2013
@@ -32,6 +32,7 @@
     </style>
     <![endif]-->
 
+    
     <title>
     Apache ActiveMQ &#8482; -- What is the difference between persistent and non-persistent delivery
     </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>
@@ -97,8 +98,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/what-is-the-license.html
==============================================================================
--- websites/production/activemq/content/what-is-the-license.html (original)
+++ websites/production/activemq/content/what-is-the-license.html Fri Jul 12 12:46:14 2013
@@ -32,6 +32,7 @@
     </style>
     <![endif]-->
 
+    
     <title>
     Apache ActiveMQ &#8482; -- What is the license
     </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>
@@ -88,8 +89,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/what-is-the-prefetch-limit-for.html
==============================================================================
--- websites/production/activemq/content/what-is-the-prefetch-limit-for.html (original)
+++ websites/production/activemq/content/what-is-the-prefetch-limit-for.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; -- What is the prefetch limit for
     </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>
@@ -91,26 +101,26 @@
 
 <p>To change the prefetch size for all consumer types you would use a connection URI similar to:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-tcp:<span class="code-comment">//localhost:61616?jms.prefetchPolicy.all=50</span>
-</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+tcp://localhost:61616?jms.prefetchPolicy.all=50
+]]></script>
 </div></div>
 
 <p>To change the prefetch size for just queue consumer types you would use a connection URI similar to: </p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-tcp:<span class="code-comment">//localhost:61616?jms.prefetchPolicy.queuePrefetch=1</span>
-</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+tcp://localhost:61616?jms.prefetchPolicy.queuePrefetch=1
+]]></script>
 </div></div>
 
 
 <p>It can also be configured on a per consumer basis using <a shape="rect" href="destination-options.html" title="Destination Options">Destination Options</a>.</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-queue = <span class="code-keyword">new</span> ActiveMQQueue(<span class="code-quote">"TEST.QUEUE?consumer.prefetchSize=10"</span>);
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+queue = new ActiveMQQueue("TEST.QUEUE?consumer.prefetchSize=10");
 consumer = session.createConsumer(queue);
-</pre>
+]]></script>
 </div></div>
 
 <h3><a shape="rect" name="Whatistheprefetchlimitfor-PooledConsumersandprefetch"></a>Pooled Consumers and prefetch</h3>
@@ -135,8 +145,8 @@ One solution to this problem is to use a
 
 <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/what-jars-do-i-need.html
==============================================================================
--- websites/production/activemq/content/what-jars-do-i-need.html (original)
+++ websites/production/activemq/content/what-jars-do-i-need.html Fri Jul 12 12:46:14 2013
@@ -32,6 +32,7 @@
     </style>
     <![endif]-->
 
+    
     <title>
     Apache ActiveMQ &#8482; -- What jars do I need
     </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>
@@ -88,8 +89,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">