svn commit: r886509 - in /websites/production/activemq/content: cache/main.pageCache spring-support.html

[bu...@apache.org]

Author: buildbot
Date: Wed Nov 13 14:21:55 2013
New Revision: 886509

Log:
Production update by buildbot for activemq

Modified:
    websites/production/activemq/content/cache/main.pageCache
    websites/production/activemq/content/spring-support.html

Modified: websites/production/activemq/content/cache/main.pageCache
==============================================================================
Binary files - no diff available.

Modified: websites/production/activemq/content/spring-support.html
==============================================================================
--- websites/production/activemq/content/spring-support.html (original)
+++ websites/production/activemq/content/spring-support.html Wed Nov 13 14:21:55 2013
@@ -112,7 +112,7 @@ There is a great <a shape="rect" class="
 </div></div>
 <p>From 1.1 of ActiveMQ onwards you can also use JNDI to configure ActiveMQ within Spring. <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-core/src/test/resources/spring-jndi.xml">This example</a> shows how to configure Spring using ActiveMQ's <a shape="rect" href="jndi-support.html" title="JNDI Support">JNDI Support</a>.</p>
 
-<h3><a shape="rect" name="SpringSupport-UsingSpring2.0"></a>Using Spring 2.0</h3>
+<h3><a shape="rect" name="SpringSupport-UsingSpring"></a>Using Spring</h3>
 
 <p>If you are using the new <a shape="rect" class="external-link" href="http://static.springframework.org/spring/docs/2.0.x/reference/xsd-config.html" rel="nofollow">XML Schema-based configuration</a> of Spring 2.0 you can embed the ActiveMQ broker XML inside any regular Spring.xml file without requiring the above factory bean. e.g. here is an example of a regular Spring XML file in Spring 2.0 which also configures a broker.</p>
 
@@ -184,19 +184,6 @@ There is a great <a shape="rect" class="
 
 <p>You can use the <tt>activemq-pool</tt> <tt>org.apache.activemq.pool.PooledConnectionFactory</tt> for efficient pooling of the connections and sessions for your collection of consumers, or you can use the Spring JMS <tt>org.springframework.jms.connection.CachingConnectionFactory</tt> to achieve the same effect.</p>
 
-<h2><a shape="rect" name="SpringSupport-Usinganembeddedbroker"></a>Using an embedded broker</h2>
-
-<p>To create an embedded broker inside Spring its easiest to do it explicitly as follows...</p>
-<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-&lt;bean id="broker" class="org.apache.activemq.xbean.BrokerFactoryBean"&gt;
-    &lt;property name="config" value="classpath:org/activemq/xbean/activemq.xml" /&gt;
-    &lt;property name="start" value="true" /&gt;
-&lt;/bean&gt;
-]]></script>
-</div></div>
-<p>The referenced config file uses the <a shape="rect" href="xml-configuration.html" title="Xml Configuration">Xml Configuration</a> mechanism.</p>
-<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>Using VM Transport</b><br clear="none">Note that in ActiveMQ 4.x or later if you configure the ActiveMQConnectionFactory with the <b>vm:</b> transport then you do not have to configure an embedded broker explicitly - one will be auto-created for you - unless you wish to explicitly configure the transports and persistence options used on the embedded broker.</td></tr></table></div>
 
 <h2><a shape="rect" name="SpringSupport-MoreInformation"></a>More Information</h2>