Author: jmesnil Date: 2010-08-31 12:01:47 -0400 (Tue, 31 Aug 2010) New Revision: 9617 Modified: branches/Branch_2_1/docs/user-manual/en/embedding-hornetq.xml branches/Branch_2_1/merge-activity.txt Log: merging -r9615:9616 from trunk Modified: branches/Branch_2_1/docs/user-manual/en/embedding-hornetq.xml =================================================================== --- branches/Branch_2_1/docs/user-manual/en/embedding-hornetq.xml 2010-08-31 15:46:14 UTC (rev 9616) +++ branches/Branch_2_1/docs/user-manual/en/embedding-hornetq.xml 2010-08-31 16:01:47 UTC (rev 9617) @@ -66,18 +66,18 @@ <para>You need to instantiate and start HornetQ server. The class <literal servers with common configurations.</para> - <programlisting>import org.hornetq.api.core.server.HornetQ; -import org.hornetq.core.server.HornetQServer; + <programlisting>import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; + ... -HornetQServer server = HornetQ.newHornetQServer(config); +HornetQServer server = HornetQServers.newHornetQServer(config); server.start();</programlisting> <para>You also have the option of instantiating <literal>HornetQServerImpl</literal> directly:</para> - <programlisting>HornetQServer server = - new HornetQServerImpl(config); + <programlisting>HornetQServer server = new HornetQServerImpl(config); server.start();</programlisting> </section> <section> Modified: branches/Branch_2_1/merge-activity.txt =================================================================== --- branches/Branch_2_1/merge-activity.txt 2010-08-31 15:46:14 UTC (rev 9616) +++ branches/Branch_2_1/merge-activity.txt 2010-08-31 16:01:47 UTC (rev 9617) @@ -9,3 +9,5 @@ There was also a manual copy of JournalImpl.java on this merge, since there was a minor change before that needed to be applied - 30-aug-2010 - clebert - merge from trunk -r9590:9598 + +- 31-aug-2010 - jmesnil - merge from trunk -r9615:9616