Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

For journal jdbc config, revert to more explicit bean config as the journalJDBC xbean BeanFactory usage does not validate with spring 3.0 https://issues.apache.org/activemq/browse/AMQ-2547 - upgrading trunk to spring 3.0.1.RELEASE 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@917556 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Tully 2010-03-01 15:00:47 +00:00
parent a5e9060119
commit 71fcf59fe8
5 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
activemq-console/src/test/resources/activemq.xml
View File

@ -16,21 +16,26 @@
limitations under the License.
-->
<!-- START SNIPPET: xbean -->
<beans>
<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">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<!-- Default configuration -->
<broker useJmx="false" xmlns="http://activemq.apache.org/schema/core">
<persistenceFactory>
<journalPersistenceAdapterFactory journalLogFiles="2" dataDirectory="target/foo"/>
</persistenceFactory>
<transportConnectors>
<transportConnector uri="tcp://localhost:61616"/>
</transportConnectors>
<persistenceAdapter>
<journaledJDBC journalLogFiles="2" dataDirectory="target/foo"/>
</persistenceAdapter>
</transportConnector>
</broker>
<!-- Example of broker configuration that uses new logging options and dynamic management of logging

6
activemq-rar/src/main/rar/broker-config.xml
View File

@ -27,9 +27,9 @@
<managementContext createConnector="false"/>
</managementContext>
<persistenceAdapter>
<journaledJDBC journalLogFiles="5" dataDirectory="../data"/>
</persistenceAdapter>
<persistenceFactory>
<journalPersistenceAdapterFactory journalLogFiles="5" dataDirectory="../data"/>
</persistenceFactory>
<transportConnectors>
<transportConnector uri="tcp://localhost:61616"/>

6
assembly/src/release/example/conf/activemq.xml
View File

@ -26,9 +26,9 @@
<broker xmlns="http://activemq.apache.org/schema/core" useJmx="false">
<persistenceAdapter>
<journaledJDBC journalLogFiles="5" dataDirectory="../data"/>
</persistenceAdapter>
<persistenceFactory>
<journalPersistenceAdapterFactory journalLogFiles="5" dataDirectory="../data"/>
</persistenceFactory>
<transportConnectors>
<transportConnector uri="tcp://localhost:61616"/>

2
assembly/src/sample-conf/activemq-demo.xml
View File

@ -139,7 +139,7 @@
persistence.
<persistenceFactory>
<journaledJDBC dataDirectory="${activemq.base}/data" dataSource="#postgres-ds"/>
<journalPersistenceAdapterFactory dataDirectory="${activemq.base}/data" dataSource="#postgres-ds"/>
</persistenceFactory>
-->

2
assembly/src/sample-conf/quickJdbc-example.xml
View File

@ -23,7 +23,7 @@
<broker useJmx="false" brokerName="quickJdbcBroker" xmlns="http://activemq.apache.org/schema/core">
<persistenceFactory>
<journaledJDBC journalLogFiles="4"
<journalPersistenceAdapterFactory journalLogFiles="4"
journalLogFileSize="32768"
useJournal="true"
useQuickJournal="true"