You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2010/03/01 16:00:47 UTC
svn commit: r917556 - in /activemq/trunk:
activemq-console/src/test/resources/ activemq-rar/src/main/rar/
assembly/src/release/example/conf/ assembly/src/sample-conf/
Author: gtully
Date: Mon Mar 1 15:00:47 2010
New Revision: 917556
URL: http://svn.apache.org/viewvc?rev=917556&view=rev
Log:
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
Modified:
activemq/trunk/activemq-console/src/test/resources/activemq.xml
activemq/trunk/activemq-rar/src/main/rar/broker-config.xml
activemq/trunk/assembly/src/release/example/conf/activemq.xml
activemq/trunk/assembly/src/sample-conf/activemq-demo.xml
activemq/trunk/assembly/src/sample-conf/quickJdbc-example.xml
Modified: activemq/trunk/activemq-console/src/test/resources/activemq.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-console/src/test/resources/activemq.xml?rev=917556&r1=917555&r2=917556&view=diff
==============================================================================
--- activemq/trunk/activemq-console/src/test/resources/activemq.xml (original)
+++ activemq/trunk/activemq-console/src/test/resources/activemq.xml Mon Mar 1 15:00:47 2010
@@ -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
Modified: activemq/trunk/activemq-rar/src/main/rar/broker-config.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-rar/src/main/rar/broker-config.xml?rev=917556&r1=917555&r2=917556&view=diff
==============================================================================
--- activemq/trunk/activemq-rar/src/main/rar/broker-config.xml (original)
+++ activemq/trunk/activemq-rar/src/main/rar/broker-config.xml Mon Mar 1 15:00:47 2010
@@ -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"/>
Modified: activemq/trunk/assembly/src/release/example/conf/activemq.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/example/conf/activemq.xml?rev=917556&r1=917555&r2=917556&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/example/conf/activemq.xml (original)
+++ activemq/trunk/assembly/src/release/example/conf/activemq.xml Mon Mar 1 15:00:47 2010
@@ -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"/>
Modified: activemq/trunk/assembly/src/sample-conf/activemq-demo.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/sample-conf/activemq-demo.xml?rev=917556&r1=917555&r2=917556&view=diff
==============================================================================
--- activemq/trunk/assembly/src/sample-conf/activemq-demo.xml (original)
+++ activemq/trunk/assembly/src/sample-conf/activemq-demo.xml Mon Mar 1 15:00:47 2010
@@ -139,7 +139,7 @@
persistence.
<persistenceFactory>
- <journaledJDBC dataDirectory="${activemq.base}/data" dataSource="#postgres-ds"/>
+ <journalPersistenceAdapterFactory dataDirectory="${activemq.base}/data" dataSource="#postgres-ds"/>
</persistenceFactory>
-->
Modified: activemq/trunk/assembly/src/sample-conf/quickJdbc-example.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/sample-conf/quickJdbc-example.xml?rev=917556&r1=917555&r2=917556&view=diff
==============================================================================
--- activemq/trunk/assembly/src/sample-conf/quickJdbc-example.xml (original)
+++ activemq/trunk/assembly/src/sample-conf/quickJdbc-example.xml Mon Mar 1 15:00:47 2010
@@ -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"