Author: gnodet
Date: Wed Aug 30 18:28:11 2006
New Revision: 438740
URL: http://svn.apache.org/viewvc?rev=438740&view=rev
Log:
Make sure that only one jms broker is started.
Update tx example of configuring howl
Reduce logging for jencks and activemq
Modified:
incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/log4j.xml
incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/servicemix.xml
incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/tx.xml
Modified:
incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/log4j.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/log4j.xml?rev=438740&r1=438739&r2=438740&view=diff
==============================================================================
---
incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/log4j.xml
(original)
+++
incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/log4j.xml
Wed Aug 30 18:28:11 2006
@@ -42,6 +42,15 @@
<logger name="org.springframework">
<level value="WARN"/>
</logger>
+ <logger name="org.jencks">
+ <level value="WARN"/>
+ </logger>
+ <logger name="org.apache.activemq">
+ <level value="WARN"/>
+ </logger>
+ <logger name="org.apache.activemq.transport.discovery">
+ <level value="ERROR"/>
+ </logger>
<logger name="org.apache.servicemix">
<!-- To enable debug logging, replace the INFO by DEBUG -->
<level value="INFO"/>
Modified:
incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/servicemix.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/servicemix.xml?rev=438740&r1=438739&r2=438740&view=diff
==============================================================================
---
incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/servicemix.xml
(original)
+++
incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/servicemix.xml
Wed Aug 30 18:28:11 2006
@@ -54,7 +54,7 @@
<sm:sedaFlow />
<sm:jcaFlow bootstrapContext="#bootstrapContext"
connectionManager="#connectionManager"
- jmsURL="vm://localhost" />
+ jmsURL="vm://ServiceMix" />
</sm:flows>
</sm:securedBroker>
</sm:broker>
Modified:
incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/tx.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/tx.xml?rev=438740&r1=438739&r2=438740&view=diff
==============================================================================
--- incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/tx.xml
(original)
+++ incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/tx.xml
Wed Aug 30 18:28:11 2006
@@ -17,33 +17,17 @@
limitations under the License.
-->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
"http://www.springframework.org/dtd/spring-beans.dtd";>
<beans>
+ <!-- XID factory -->
+ <bean id="xidFactory"
class="org.apache.geronimo.transaction.manager.XidFactoryImpl" />
+
<!-- Transaction log -->
<bean id="transactionLog"
class="org.apache.geronimo.transaction.log.UnrecoverableLog" />
<!--
- <bean id="transactionLog"
class="org.apache.geronimo.transaction.log.HOWLLog">
- <contructor-arg value="org.objectweb.howl.log.BlockLogBuffer"/>
- <contructor-arg value="32"/>
- <construcor-arg value="true"/>
- <construcor-arg value="50"/>
- <construcor-arg value="var/txlog"/>
- <construcor-arg value="log"/>
- <construcor-arg value="howl"/>
- <construcor-arg value="-1"/>
- <construcor-arg value="0"/>
- <construcor-arg value="2"/>
- <construcor-arg value="4"/>
- <construcor-arg value="-1"/>
- <construcor-arg>
- <bean class="org.apache.geronimo.transaction.manager.XidFactoryImpl"/>
- </constructor-arg>
- <construcor-arg>
- <bean class="org.apache.geronimo.system.serverinfo.ServerInfo">
- <constructor-arg value="var/geronimo"/>
- </bean>
- </constructor-arg>
+ <bean id="transactionLog" class="org.jencks.factory.HowlLogFactoryBean">
+ <property name="logFileDir" value="./data/txlog" />
+ <property name="xidFactory" ref="xidFactory" />
</bean>
-->
@@ -56,6 +40,7 @@
<!-- Transaction context manager -->
<bean id="transactionContextManager"
class="org.jencks.factory.TransactionContextManagerFactoryBean">
<property name="transactionManager" ref="extendedTransactionManager"/>
+ <property name="xidFactory" ref="xidFactory" />
</bean>
<!-- Public transaction manager -->
